From da2f4733e667dabcb478baa4b62ad0b2f4fbc0d1 Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Thu, 2 Aug 2012 09:41:00 +0000
Subject: [PATCH] Preserve state of lock keys when keymap is loaded.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Axel Dörfler <axeld@pinc-software.de>
---
 src/preferences/keymap/Keymap.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/preferences/keymap/Keymap.cpp b/src/preferences/keymap/Keymap.cpp
index 6001ae72f5..817d86ef2c 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;
 }