From 1826d95339a371d6246b1453605374260e111e47 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 8 Mar 2010 22:37:44 +0200 Subject: Add unassign button in setup keyboard tab. Signed-off-by: Chuck Miller --- src/keyboardconfig.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/keyboardconfig.cpp') diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp index 7b462c25..65143d69 100644 --- a/src/keyboardconfig.cpp +++ b/src/keyboardconfig.cpp @@ -154,8 +154,14 @@ bool KeyboardConfig::hasConflicts() */ for (i = 0; i < KEY_TOTAL; i++) { + if (mKey[i].value == KEY_NO_VALUE) + continue; + for (j = i, j++; j < KEY_TOTAL; j++) { + if (mKey[j].value == KEY_NO_VALUE) + continue; + // Allow collisions between shortcut and emote keys if ((i >= KEY_SHORTCUT_1 && i <= KEY_SHORTCUT_12) && (j >= KEY_EMOTE_1 && j <= KEY_EMOTE_12)) continue; -- cgit v1.2.3-70-g09d2