From 37d77253cfd5cc1c7bef635d4d5bd05eb53ac02c Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 7 Jan 2012 22:07:16 -0600
Subject: KEYMAPPER: Add failsafe code for popping into Keymapper itself

Thanks LordHoto
---
 gui/gui-manager.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'gui/gui-manager.cpp')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index a9b8085c52..64853b5096 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -132,15 +132,7 @@ void GuiManager::pushKeymap() {
 }
 
 void GuiManager::popKeymap() {
-	Common::Keymapper *keymapper = _system->getEventManager()->getKeymapper();
-	if (!keymapper->getActiveStack().empty()) {
-		Common::Keymapper::MapRecord topKeymap = keymapper->getActiveStack().top();
-		// TODO: Don't use the keymap name as a way to discriminate GUI maps
-		if(topKeymap.keymap->getName().equals(Common::kGuiKeymapName))
-			keymapper->popKeymap();
-		else
-			warning("An attempt to pop non-gui keymap %s was blocked", topKeymap.keymap->getName().c_str());
-	}
+	_system->getEventManager()->getKeymapper()->popKeymap(Common::kGuiKeymapName);
 }
 #endif
 
-- 
cgit v1.2.3