diff options
| author | Tarek Soliman | 2011-10-31 22:38:05 -0500 |
|---|---|---|
| committer | Tarek Soliman | 2011-10-31 22:59:55 -0500 |
| commit | 6523454db5c115bcaf1bc24380a444dfbdab43e3 (patch) | |
| tree | 1a27d9117b55f1837377a221d81a873cbb58a65d /gui/dialog.cpp | |
| parent | 843f19788b7d83074f811f786663186fc43e64e1 (diff) | |
| download | scummvm-rg350-6523454db5c115bcaf1bc24380a444dfbdab43e3.tar.gz scummvm-rg350-6523454db5c115bcaf1bc24380a444dfbdab43e3.tar.bz2 scummvm-rg350-6523454db5c115bcaf1bc24380a444dfbdab43e3.zip | |
KEYMAPPER: Put the gui keymap pushing/popping back in GuiManager::runLoop
This because theoretically the GUI could be run without a dialog.
This also fixes the situations where the GUI keymap gets popped more times than pushed.
Thanks sev
Diffstat (limited to 'gui/dialog.cpp')
| -rw-r--r-- | gui/dialog.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 9f18baec9e..0522b40b46 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -86,10 +86,6 @@ void Dialog::open() { } setFocusWidget(w); -#ifdef ENABLE_KEYMAPPER - g_gui.initKeymap(); - g_gui.pushKeymap(); -#endif } void Dialog::close() { @@ -101,10 +97,6 @@ void Dialog::close() { } releaseFocus(); g_gui.closeTopDialog(); -#ifdef ENABLE_KEYMAPPER - g_gui.popKeymap(); -#endif - } void Dialog::reflowLayout() { |