aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-18 15:09:59 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-18 15:09:59 (GMT)
commitccba298cb59e2d2dbd2235188e0695fff62c4799 (patch)
tree49c49561cd23295d3505f9e40f85fa4d3cb23ad4
parent19d024cc53817a767d661698c448dbc9f8d869ab (diff)
downloadfluxbox-ccba298cb59e2d2dbd2235188e0695fff62c4799.zip
fluxbox-ccba298cb59e2d2dbd2235188e0695fff62c4799.tar.bz2
fix a bug with Some and Every commands and the stupid global current window variable
-rw-r--r--src/WorkspaceCmd.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index ef7d992..7a8bbc4 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -125,8 +125,10 @@ bool SomeCmd::execute() {
125 WinClient *client = dynamic_cast<WinClient *>(*it); 125 WinClient *client = dynamic_cast<WinClient *>(*it);
126 if (!client) continue; 126 if (!client) continue;
127 WindowCmd<void>::setClient(client); 127 WindowCmd<void>::setClient(client);
128 if (m_cmd->execute()) 128 if (m_cmd->execute()) {
129 WindowCmd<void>::setClient(old);
129 return true; 130 return true;
131 }
130 } 132 }
131 WindowCmd<void>::setClient(old); 133 WindowCmd<void>::setClient(old);
132 } 134 }
@@ -146,8 +148,10 @@ bool EveryCmd::execute() {
146 WinClient *client = dynamic_cast<WinClient *>(*it); 148 WinClient *client = dynamic_cast<WinClient *>(*it);
147 if (!client) continue; 149 if (!client) continue;
148 WindowCmd<void>::setClient(client); 150 WindowCmd<void>::setClient(client);
149 if (!m_cmd->execute()) 151 if (!m_cmd->execute()) {
152 WindowCmd<void>::setClient(old);
150 return false; 153 return false;
154 }
151 } 155 }
152 WindowCmd<void>::setClient(old); 156 WindowCmd<void>::setClient(old);
153 } 157 }