summaryrefslogtreecommitdiff
path: root/src/CurrentWindowCmd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/CurrentWindowCmd.cc')
-rw-r--r--src/CurrentWindowCmd.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index de50c60..dc27056 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -34,9 +34,9 @@
34CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { } 34CurrentWindowCmd::CurrentWindowCmd(Action act):m_action(act) { }
35 35
36void CurrentWindowCmd::execute() { 36void CurrentWindowCmd::execute() {
37 WinClient *client = FocusControl::focusedWindow(); 37 FluxboxWindow *win = FocusControl::focusedFbWindow();
38 if (client && client->fbwindow()) 38 if (win)
39 (client->fbwindow()->*m_action)(); 39 (win->*m_action)();
40} 40}
41 41
42 42
@@ -97,8 +97,7 @@ void GoToTabCmd::real_execute() {
97} 97}
98 98
99void WindowHelperCmd::execute() { 99void WindowHelperCmd::execute() {
100 WinClient *client = FocusControl::focusedWindow(); 100 if (FocusControl::focusedFbWindow()) // guarantee that fbwindow() exists too
101 if (client && client->fbwindow()) // guarantee that fbwindow() exists too
102 real_execute(); 101 real_execute();
103} 102}
104 103
@@ -109,7 +108,7 @@ WinClient &WindowHelperCmd::winclient() {
109 108
110FluxboxWindow &WindowHelperCmd::fbwindow() { 109FluxboxWindow &WindowHelperCmd::fbwindow() {
111 // will exist from execute above 110 // will exist from execute above
112 return *FocusControl::focusedWindow()->fbwindow(); 111 return *FocusControl::focusedFbWindow();
113} 112}
114 113
115MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) : 114MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :