From b5f966ceb57b1d45f8c01b16f049fdea17f54a0d Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 8 Jun 2015 21:56:32 +0200
Subject: SHERLOCK: events delay quit event

---
 engines/sherlock/events.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index afd3602758..f7031f012e 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -210,7 +210,7 @@ bool Events::delay(uint32 time, bool interruptable) {
 		// For really short periods, simply delay by the desired amount
 		pollEvents();
 		g_system->delayMillis(time);
-		bool result = !(interruptable && (kbHit() || _pressed));
+		bool result = !(interruptable && (kbHit() || _pressed || _vm->shouldQuit()));
 
 		clearEvents();
 		return result;
@@ -229,7 +229,7 @@ bool Events::delay(uint32 time, bool interruptable) {
 			}
 		}
 
-		return true;
+		return !_vm->shouldQuit();
 	}
 }
 
-- 
cgit v1.2.3