aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-01-31 12:00:20 +0000
committerJohannes Schickel2009-01-31 12:00:20 +0000
commit31d40307bcc9d95c4caab2199293f6814812ea3c (patch)
tree2c97f62bb3762677f7643a2fe3b1da510bf19d97
parentb2b37d3d67ab9cdadac416437c38529a26d201ca (diff)
downloadscummvm-rg350-31d40307bcc9d95c4caab2199293f6814812ea3c.tar.gz
scummvm-rg350-31d40307bcc9d95c4caab2199293f6814812ea3c.tar.bz2
scummvm-rg350-31d40307bcc9d95c4caab2199293f6814812ea3c.zip
Fix for bug #2551436 "KYRA2: ScummVM quits after death".
svn-id: r36161
-rw-r--r--engines/kyra/kyra_hof.cpp2
-rw-r--r--engines/kyra/kyra_mr.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 01af6fb0bc..9875a17491 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -465,7 +465,7 @@ void KyraEngine_HoF::runLoop() {
_gui->optionsButton(0);
_deathHandler = -1;
- if (!_runFlag || !shouldQuit())
+ if (!_runFlag || shouldQuit())
break;
}
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 20b0fa7688..6baa90ea8f 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -1012,7 +1012,7 @@ void KyraEngine_MR::runLoop() {
_gui->optionsButton(0);
_deathHandler = -1;
- if (shouldQuit())
+ if (!_runFlag || shouldQuit())
break;
}