diff options
| author | Max Horn | 2008-12-27 16:07:10 +0000 |
|---|---|---|
| committer | Max Horn | 2008-12-27 16:07:10 +0000 |
| commit | 1d099c0d402a23def85839f4759558700fcd1ad1 (patch) | |
| tree | bb3e60c69888c3867679444bbdea96578ab69853 | |
| parent | f26f85ee96625003edc08b370e6f3a08505a075d (diff) | |
| download | scummvm-rg350-1d099c0d402a23def85839f4759558700fcd1ad1.tar.gz scummvm-rg350-1d099c0d402a23def85839f4759558700fcd1ad1.tar.bz2 scummvm-rg350-1d099c0d402a23def85839f4759558700fcd1ad1.zip | |
GuiManager::runLoop: do not call OSystem::quit() when receiving EVENT_QUIT, just return to the caller instead
svn-id: r35573
| -rw-r--r-- | gui/newgui.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 32e67fe360..9ae0db6470 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -25,14 +25,14 @@ #include "common/events.h" #include "common/system.h" #include "common/util.h" -#include "engines/engine.h" -#include "graphics/cursorman.h" +#include "common/config-manager.h" + #include "gui/newgui.h" #include "gui/dialog.h" #include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" -#include "common/config-manager.h" +#include "graphics/cursorman.h" DECLARE_SINGLETON(GUI::GuiManager); @@ -258,8 +258,6 @@ void GuiManager::runLoop() { activeDialog->handleMouseWheel(mouse.x, mouse.y, 1); break; case Common::EVENT_QUIT: - if (!g_engine) - _system->quit(); return; case Common::EVENT_SCREEN_CHANGED: screenChange(); |