diff options
-rw-r--r-- | engines/lab/engine.cpp | 2 | ||||
-rw-r--r-- | engines/lab/intro.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 2916186541..69ebae6548 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -741,7 +741,7 @@ static void mainGameLoop() { WSDL_ProcessInput(1); if (GotMessage) { - if (QuitLab) { + if (QuitLab || g_engine->shouldQuit()) { stopDiff(); break; } diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp index e37b347d68..7f0b53f98d 100644 --- a/engines/lab/intro.cpp +++ b/engines/lab/intro.cpp @@ -69,11 +69,17 @@ void introEatMessages() { while (1) { Msg = getMsg(); + if (g_engine->shouldQuit()) { + QuitIntro = true; + return; + } + if (Msg == NULL) return; else { if (((Msg->Class == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Msg->Qualifier)) || - ((Msg->Class == RAWKEY) && (Msg->Code == 27))) + ((Msg->Class == RAWKEY) && (Msg->Code == 27)) + ) QuitIntro = true; replyMsg(Msg); |