[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.48,1.49

Chris Apers chrilith at users.sourceforge.net
Tue Jul 22 01:34:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv11172/gui

Modified Files:
	newgui.cpp 
Log Message:
Fix for bug #775512

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- newgui.cpp	14 Jun 2003 21:16:22 -0000	1.48
+++ newgui.cpp	22 Jul 2003 08:33:13 -0000	1.49
@@ -23,6 +23,9 @@
 #include "newgui.h"
 #include "dialog.h"
 
+#ifdef __PALM_OS__
+#	include "palm.h"
+#endif
 
 #ifdef _MSC_VER
 #	pragma warning( disable : 4068 ) // unknown pragma
@@ -118,7 +121,15 @@
 	}
 
 	while (!_dialogStack.empty() && activeDialog == _dialogStack.top()) {
-
+#ifdef __PALM_OS__
+		// There is no exit(.) function under PalmOS, to exit an app
+		// we need to send an 'exit' event to the event handler
+		// and then the system return to the launcher. But this event
+		// is not handled by the following loop and so we need to force exit.
+		// In other systems like Windows ScummVM exit immediatly and so this doesn't appear.
+		if (((OSystem_PALMOS *)_system)->_quit)
+			return;
+#endif
 		activeDialog->handleTickle();
 
 		if (_needRedraw) {
@@ -528,4 +539,3 @@
 }
 void NewGui_releaseGlobals(){	GRELEASEPTR(GBVARS_GUIFONT_INDEX, GBVARS_SCUMM)				}
 #endif
-





More information about the Scummvm-git-logs mailing list