[Scummvm-cvs-logs] scummvm master -> b5f966ceb57b1d45f8c01b16f049fdea17f54a0d

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b5f966ceb5 SHERLOCK: events delay quit event


Commit: b5f966ceb57b1d45f8c01b16f049fdea17f54a0d
    https://github.com/scummvm/scummvm/commit/b5f966ceb57b1d45f8c01b16f049fdea17f54a0d
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-08T21:56:32+02:00

Commit Message:
SHERLOCK: events delay quit event

Changed paths:
    engines/sherlock/events.cpp



diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index afd3602..f7031f0 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();
 	}
 }