(ckb) Fix key bindings sometimes duplicating themselves when they sho…

…uldn't
ccMSC · Mar 4, 2015 · 925b1e9 · 925b1e9
1 parent 58a72a9
commit 925b1e9
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/ckb/rebindwidget.cpp b/src/ckb/rebindwidget.cpp
@@ -95,14 +95,12 @@ void RebindWidget::setSelection(const QStringList& newSelection, bool applyPrevi
         // Select nothing if any are unbound or different
         foreach(const QString& key, selection){
             QString keyAction = bind->action(key);
-            if(keyAction.isEmpty())
+            if(keyAction.isEmpty() || (hasAction && keyAction != action)){
+                hasAction = false;
                 break;
-            if(action.isEmpty()){
+            } else if(action.isEmpty()){
                 action = keyAction;
                 hasAction = true;
-            } else if(keyAction != action){
-                hasAction = false;
-                break;
             }
         }
     }