more fixes, better sanity detection and error messages. it shouldn't hog the keyboard in any case now. it won't grab when modifiers or keys are borked.

1 files changed, 4 insertions, 9 deletions

diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc
index 5a3515ea..94b542b0 100644
--- a/util/epist/keytree.cc
+++ b/util/epist/keytree.cc
@@ -195,13 +195,8 @@ void keytree::addAction(Action::ActionType action, unsigned int mask,
   }
 
   KeySym sym = XStringToKeysym(key.c_str());
-
-  if (sym == 0) {
-    std::cerr << "Key " << key << " is invalid! (Action ignored)\n";
-    return;
-  }
-
   keynode *tmp = new keynode;
+
   tmp->action = new Action(action,
                            XKeysymToKeycode(_display, sym),
                            mask, arg);
@@ -229,10 +224,10 @@ void keytree::setCurrentNodeProps(Action::ActionType action, unsigned int mask,
 {
   if (_current->action)
     delete _current->action;
-  
+
+  KeySym sym = XStringToKeysym(key.c_str());
   _current->action = new Action(action,
-                                XKeysymToKeycode(_display,
-                                                 XStringToKeysym(key.c_str())),
+                                XKeysymToKeycode(_display, sym),
                                 mask, arg);
 }