[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.16,1.17

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


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv11172/backends/palmos/src

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

Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- palm.cpp	13 Jul 2003 11:03:33 -0000	1.16
+++ palm.cpp	22 Jul 2003 08:33:13 -0000	1.17
@@ -621,9 +621,11 @@
 	UInt32 current_msecs;
 	UInt32 keyCurrentState;
 	Coord x, y;
-	
-	if(_quit)
+
+	if(_quit) {
+		exit(0);	// resend an exit event
 		return false;
+	}
 
 	current_msecs = get_msecs();
 	//thread handler
@@ -642,6 +644,9 @@
 		_timer.next_expiry = current_msecs + _timer.duration;
 	}
 
+	if (_selfQuit)
+		quit();
+
 	for(;;) {
 		EvtGetEvent(&ev, evtNoWait);
 
@@ -677,10 +682,8 @@
 
 				case vchrCalc:
 					if (_lastKeyPressed == vchrCalc)
-						if ((get_msecs() - _exit_delay) <= (EXITDELAY)) {
+						if ((get_msecs() - _exit_delay) <= (EXITDELAY))
 							_selfQuit = true;
-							quit();
-						}
 
 					_exit_delay = get_msecs();
 					_lastKeyPressed = vchrCalc;
@@ -735,7 +738,6 @@
 				case vchrHardCradle:
 				case vchrHardCradle2:
 					_selfQuit = true;
-					quit();
 			}
 		}
 		// check for hardkey repeat
@@ -779,7 +781,6 @@
 					
 					if  (ev.data.keyDown.chr == 'z' && b == KBD_CTRL) {
 						_selfQuit = true;
-						quit();
 
 					} else if (ev.data.keyDown.chr == 'n' && b == KBD_CTRL) {
 						UInt8 *scr = _screenP + _screenWidth * (_screenHeight + 2);
@@ -1144,7 +1145,7 @@
 	
 	// stop current play if any
 	MsaStop(_msaRefNum, true);
-	// retreive track info
+	// retreive track infos
 	e = MsaGetTrackInfo(_msaRefNum, _msaTrack, 0, msa_LANG_CODE_ASCII, &trackH);
 //	if (e) doErr(e, "MsaGetTrackInfo");
 	// track exists





More information about the Scummvm-git-logs mailing list