aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-07-06 21:33:22 +0000
committerRobert Göffringmann2003-07-06 21:33:22 +0000
commit2061741bd5112e1fbb05c203d45737cbd7d00d80 (patch)
treed982f2e0f059de63538828a08101c968445238a2 /sky/sky.cpp
parent8d4fea8c6d052f9f37f7d43c2db8b091a280936e (diff)
downloadscummvm-rg350-2061741bd5112e1fbb05c203d45737cbd7d00d80.tar.gz
scummvm-rg350-2061741bd5112e1fbb05c203d45737cbd7d00d80.tar.bz2
scummvm-rg350-2061741bd5112e1fbb05c203d45737cbd7d00d80.zip
fix bug #766744 (BASS: Crash when quitting while quitting)
svn-id: r8817
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r--sky/sky.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 77a5408b6a..35ec77a9c0 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -71,7 +71,7 @@ Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst) {
void **SkyState::_itemList[300];
-SystemVars SkyState::_systemVars = {0, 0, 0, 0, 4316, 0, false};
+SystemVars SkyState::_systemVars = {0, 0, 0, 0, 4316, 0, false, false };
SkyState::SkyState(GameDetector *detector, OSystem *syst)
: Engine(detector, syst) {
@@ -332,7 +332,8 @@ void SkyState::delay(uint amount) { //copied and mutilated from Simon.cpp
break;
case OSystem::EVENT_QUIT:
- _skyControl->showGameQuitMsg(); // will call _system->quit()
+ if (!SkyState::_systemVars.quitting)
+ _skyControl->showGameQuitMsg(); // will call _system->quit()
break;
default: