diff options
| author | Tarek Soliman | 2012-01-07 22:07:16 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-01-07 22:08:57 -0600 |
| commit | 37d77253cfd5cc1c7bef635d4d5bd05eb53ac02c (patch) | |
| tree | 513c31b57190ae19e326f4be60371fb7a1b141a8 /gui/gui-manager.cpp | |
| parent | d143872be605b881eaec63b0168c9d4d551787ee (diff) | |
| download | scummvm-rg350-37d77253cfd5cc1c7bef635d4d5bd05eb53ac02c.tar.gz scummvm-rg350-37d77253cfd5cc1c7bef635d4d5bd05eb53ac02c.tar.bz2 scummvm-rg350-37d77253cfd5cc1c7bef635d4d5bd05eb53ac02c.zip | |
KEYMAPPER: Add failsafe code for popping into Keymapper itself
Thanks LordHoto
Diffstat (limited to 'gui/gui-manager.cpp')
| -rw-r--r-- | gui/gui-manager.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
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 |