diff options
| author | Chris Apers | 2003-07-22 08:33:13 +0000 |
|---|---|---|
| committer | Chris Apers | 2003-07-22 08:33:13 +0000 |
| commit | 6d9237509365f5d385e9c3fd80d44cac0bccfffe (patch) | |
| tree | f16fc69105a5e3208d29ef6dcc1e50e24a8168b8 /backends | |
| parent | 2cee32864a8be752abf0a0680f833b270db91973 (diff) | |
| download | scummvm-rg350-6d9237509365f5d385e9c3fd80d44cac0bccfffe.tar.gz scummvm-rg350-6d9237509365f5d385e9c3fd80d44cac0bccfffe.tar.bz2 scummvm-rg350-6d9237509365f5d385e9c3fd80d44cac0bccfffe.zip | |
Fix for bug #775512
svn-id: r9117
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/PalmOS/Src/palm.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index 5ee2319f82..529b720897 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -621,9 +621,11 @@ bool OSystem_PALMOS::poll_event(Event *event) { 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 @@ bool OSystem_PALMOS::poll_event(Event *event) { _timer.next_expiry = current_msecs + _timer.duration; } + if (_selfQuit) + quit(); + for(;;) { EvtGetEvent(&ev, evtNoWait); @@ -677,10 +682,8 @@ bool OSystem_PALMOS::poll_event(Event *event) { 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 @@ bool OSystem_PALMOS::poll_event(Event *event) { case vchrHardCradle: case vchrHardCradle2: _selfQuit = true; - quit(); } } // check for hardkey repeat @@ -779,7 +781,6 @@ bool OSystem_PALMOS::poll_event(Event *event) { 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 @@ void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int e // 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 |