[haiku-commits] haiku: hrev44455 - src/preferences/keymap
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 2 Aug 2012 00:07:48 +0200 (CEST)
hrev44455 adds 1 changeset to branch 'master'
old head: 894bce690b05255caf4b48979b649cebb001658c
new head: da2f4733e667dabcb478baa4b62ad0b2f4fbc0d1
----------------------------------------------------------------------------
da2f473: Preserve state of lock keys when keymap is loaded.
Signed-off-by: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44455
Commit: da2f4733e667dabcb478baa4b62ad0b2f4fbc0d1
URL: http://cgit.haiku-os.org/haiku/commit/?id=da2f473
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Thu Aug 2 09:41:00 2012 UTC
Committer: Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Wed Aug 1 22:04:52 2012 UTC
----------------------------------------------------------------------------
1 file changed, 4 insertions(+), 1 deletion(-)
src/preferences/keymap/Keymap.cpp | 5 ++++-
----------------------------------------------------------------------------
diff --git a/src/preferences/keymap/Keymap.cpp
b/src/preferences/keymap/Keymap.cpp
index 6001ae7..817d86e 100644
--- a/src/preferences/keymap/Keymap.cpp
+++ b/src/preferences/keymap/Keymap.cpp
@@ -339,7 +339,10 @@ Keymap::SetDeadKeyTrigger(dead_key_index deadKeyIndex,
const BString& trigger)
status_t
Keymap::Use()
{
- return _restore_key_map_();
+ status_t result = _restore_key_map_();
+ if (result == B_OK)
+ set_keyboard_locks(modifiers());
+ return result;
}
Other related posts:
