1 files changed, 1 insertions, 12 deletions

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 00cdfee..61402f1 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -520,14 +520,9 @@ void Toolbar::reconfigure() {
 
 
 void Toolbar::buttonPressEvent(XButtonEvent &be) {
-    WinClient *old = WindowCmd<void>::client();
-    WindowCmd<void>::setWindow(0);
     if (Fluxbox::instance()->keys()->doAction(be.type, be.state, be.button,
-                                              Keys::ON_TOOLBAR, be.time)) {
-        WindowCmd<void>::setClient(old);
+                                              Keys::ON_TOOLBAR, 0, be.time))
         return;
-    }
-    WindowCmd<void>::setClient(old);
 
     if (be.button == 1)
         raise();
@@ -553,11 +548,8 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
 }
 
 void Toolbar::enterNotifyEvent(XCrossingEvent &ce) {
-    WinClient *old = WindowCmd<void>::client();
-    WindowCmd<void>::setWindow(0);
     Fluxbox::instance()->keys()->doAction(ce.type, ce.state, 0,
                                           Keys::ON_TOOLBAR);
-    WindowCmd<void>::setClient(old);
 
     if (! doAutoHide()) {
         if (isHidden())
@@ -580,11 +572,8 @@ void Toolbar::leaveNotifyEvent(XCrossingEvent &event) {
         event.y_root > y() && event.y_root <= (int)(y() + height()))
         return;
 
-    WinClient *old = WindowCmd<void>::client();
-    WindowCmd<void>::setWindow(0);
     Fluxbox::instance()->keys()->doAction(event.type, event.state, 0,
                                           Keys::ON_TOOLBAR);
-    WindowCmd<void>::setClient(old);
 
     if (! doAutoHide())
         return;