aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index a827f92..c54338d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1057,11 +1057,8 @@ void BScreen::changeWorkspaceID(unsigned int id) {
1057 1057
1058 FbTk::App::instance()->sync(false); 1058 FbTk::App::instance()->sync(false);
1059 1059
1060 WinClient *focused_client = FocusControl::focusedWindow(); 1060 FluxboxWindow *focused = FocusControl::focusedFbWindow();
1061 FluxboxWindow *focused = 0; 1061
1062 if (focused_client)
1063 focused = focused_client->fbwindow();
1064
1065 if (focused && focused->isMoving()) { 1062 if (focused && focused->isMoving()) {
1066 if (doOpaqueMove()) 1063 if (doOpaqueMove())
1067 reassociateWindow(focused, id, true); 1064 reassociateWindow(focused, id, true);
@@ -1113,12 +1110,8 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
1113 if (! m_current_workspace || id >= m_workspaces_list.size()) 1110 if (! m_current_workspace || id >= m_workspaces_list.size())
1114 return; 1111 return;
1115 1112
1116 if (!win) { 1113 if (!win)
1117 WinClient *client = FocusControl::focusedWindow(); 1114 win = FocusControl::focusedFbWindow();
1118 if (client)
1119 win = client->fbwindow();
1120 }
1121
1122 1115
1123 FbTk::App::instance()->sync(false); 1116 FbTk::App::instance()->sync(false);
1124 1117