From b87ee2bfebe58eb6c6cddc5979a524b1511ed271 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Mon, 19 Aug 2013 15:35:29 -0400 Subject: [PATCH] Keymap mod keys: Conflict if either left or right ... key doesn't match rather than requiring both left and right keys to not match for a conflict. Also update copyright year --- src/preferences/keymap/ModifierKeysWindow.cpp | 4 ++-- src/preferences/keymap/ModifierKeysWindow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/preferences/keymap/ModifierKeysWindow.cpp b/src/preferences/keymap/ModifierKeysWindow.cpp index 6298652156..caed056524 100644 --- a/src/preferences/keymap/ModifierKeysWindow.cpp +++ b/src/preferences/keymap/ModifierKeysWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011 Haiku Inc. All rights reserved. + * Copyright 2011-2013 Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -754,7 +754,7 @@ ModifierKeysWindow::_DuplicateKeys() if (left == 0 && right == 0) continue; - if (left == testLeft && right == testRight) { + if (left == testLeft || right == testRight) { duplicateMask |= 1 << testKey; duplicateMask |= 1 << key; } diff --git a/src/preferences/keymap/ModifierKeysWindow.h b/src/preferences/keymap/ModifierKeysWindow.h index 336f27ad83..45b46362c6 100644 --- a/src/preferences/keymap/ModifierKeysWindow.h +++ b/src/preferences/keymap/ModifierKeysWindow.h @@ -1,5 +1,5 @@ /* - * Copyright 2011 Haiku Inc. All rights reserved. + * Copyright 2011-2013 Haiku Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: