[Scummvm-cvs-logs] SF.net SVN: scummvm:[35573] scummvm/trunk/gui/newgui.cpp

[fingolfin at users.sourceforge.net]

Revision: 35573
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35573&view=rev
Author:   fingolfin
Date:     2008-12-27 16:07:10 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
GuiManager::runLoop: do not call OSystem::quit() when receiving EVENT_QUIT, just return to the caller instead

Modified Paths:
--------------
    scummvm/trunk/gui/newgui.cpp

Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp	2008-12-27 14:36:28 UTC (rev 35572)
+++ scummvm/trunk/gui/newgui.cpp	2008-12-27 16:07:10 UTC (rev 35573)
@@ -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 @@
 				activeDialog->handleMouseWheel(mouse.x, mouse.y, 1);
 				break;
 			case Common::EVENT_QUIT:
-				if (!g_engine)
-					_system->quit();
 				return;
 			case Common::EVENT_SCREEN_CHANGED:
 				screenChange();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.