From 925b1e954b57be8a8e8a9bc1ea4a4e0e6497d282 Mon Sep 17 00:00:00 2001 From: ccMSC Date: Wed, 4 Mar 2015 00:45:43 -0700 Subject: [PATCH] (ckb) Fix key bindings sometimes duplicating themselves when they shouldn't --- src/ckb/rebindwidget.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ckb/rebindwidget.cpp b/src/ckb/rebindwidget.cpp index 24fc64f..6e784fa 100644 --- 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; } } }