1 files changed, 10 insertions, 4 deletions

diff --git a/src/Keys.cc b/src/Keys.cc
index 7187c47..76224ef 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -23,6 +23,8 @@
 
 #include "fluxbox.hh"
 #include "Screen.hh"
+#include "WinClient.hh"
+#include "WindowCmd.hh"
 
 #include "FbTk/EventManager.hh"
 #include "FbTk/StringUtil.hh"
@@ -119,7 +121,7 @@ public:
         context_ = context_ ? context_ : GLOBAL;
         keylist_t::iterator it = keylist.begin(), it_end = keylist.end();
         for (; it != it_end; it++) {
-            if ((*it)->type == type_ && (*it)->key == key_ &&
+            if (*it && (*it)->type == type_ && (*it)->key == key_ &&
                 ((*it)->context & context_) > 0 &&
                 isdouble_ == (*it)->isdouble && (*it)->mod ==
                 FbTk::KeyUtil::instance().isolateModifierMask(mod_))
@@ -168,7 +170,7 @@ Keys::t_key::~t_key() {
 
 
 
-Keys::Keys() { }
+Keys::Keys() : next_key(0) { }
 
 Keys::~Keys() {
     ungrabKeys();
@@ -181,6 +183,7 @@ void Keys::deleteTree() {
     for (keyspace_t::iterator map_it = m_map.begin(); map_it != m_map.end(); ++map_it)
         delete map_it->second;
     m_map.clear();
+    next_key = 0;
 }
 
 // keys are only grabbed in global context
@@ -479,7 +482,7 @@ bool Keys::addBinding(const string &linebuffer) {
 
 // return true if bound to a command, else false
 bool Keys::doAction(int type, unsigned int mods, unsigned int key,
-                    int context, Time time) {
+                    int context, WinClient *current, Time time) {
 
     static Time last_button_time = 0;
     static unsigned int last_button = 0;
@@ -502,7 +505,6 @@ bool Keys::doAction(int type, unsigned int mods, unsigned int key,
         isdouble = double_click;
     }
 
-    static t_key* next_key = m_keylist;
     if (!next_key)
         next_key = m_keylist;
 
@@ -546,7 +548,11 @@ bool Keys::doAction(int type, unsigned int mods, unsigned int key,
         return false;
     }
 
+    WinClient *old = WindowCmd<void>::client();
+    WindowCmd<void>::setClient(current);
     temp_key->m_command->execute();
+    WindowCmd<void>::setClient(old);
+
     if (saved_keymode) {
         if (next_key == m_keylist) // don't reset keymode if command changed it
             setKeyMode(saved_keymode);