From b708d6de79e2893cddf95d72864d4487a483e0c1 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Wed, 2 Nov 2011 10:16:16 -0500
Subject: Revert "KEYMAPPER: Make global keymap that is always active"

This reverts commit ac85d134b31f770f27d085c0fe4c307e278c1875.
---
 base/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/main.cpp b/base/main.cpp
index 352b5e9b33..61a05154c1 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -287,7 +287,8 @@ static void setupKeymapper(OSystem &system) {
 	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
 
 	mapper->addGlobalKeymap(globalMap);
-	mapper->setGlobalKeymap(globalMap);
+
+	mapper->pushKeymap("global", true);
 #endif
 
 }
-- 
cgit v1.2.3