aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/special.cpp
diff options
context:
space:
mode:
authorStrangerke2015-12-16 00:07:31 +0100
committerWillem Jan Palenstijn2015-12-23 21:34:06 +0100
commiteab6682929d47d09c0ac81921f479e46a06e93bd (patch)
tree797c8d86eb5612351d6537c87fa0a8d3022a6282 /engines/lab/special.cpp
parent3f1bb66959dbe72444d7cd1bc36609bf1e3e2f77 (diff)
downloadscummvm-rg350-eab6682929d47d09c0ac81921f479e46a06e93bd.tar.gz
scummvm-rg350-eab6682929d47d09c0ac81921f479e46a06e93bd.tar.bz2
scummvm-rg350-eab6682929d47d09c0ac81921f479e46a06e93bd.zip
LAB: Add some checks to quit the game quickly when closing ScummVM
Diffstat (limited to 'engines/lab/special.cpp')
-rw-r--r--engines/lab/special.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 38921ea650..02bbdf4c07 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -260,10 +260,14 @@ void LabEngine::processJournal() {
// Make sure we check the music at least after every message
_music->updateMusic();
IntuiMessage *msg = _event->getMsg();
+ if (g_engine->shouldQuit()) {
+ _quitLab = true;
+ return;
+ }
- if (msg == NULL) {
+ if (!msg)
_music->updateMusic();
- } else {
+ else {
uint32 msgClass = msg->_msgClass;
uint16 qualifier = msg->_qualifier;
uint16 gadID = msg->_code;
@@ -420,8 +424,12 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isIntera
// Make sure we check the music at least after every message
_music->updateMusic();
IntuiMessage *msg = _event->getMsg();
+ if (g_engine->shouldQuit()) {
+ _quitLab = true;
+ return;
+ }
- if (msg == NULL) {
+ if (!msg) {
_music->updateMusic();
} else {
uint32 msgClass = msg->_msgClass;