diff options
| author | Martin Kiewitz | 2015-06-08 21:56:32 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-08 21:56:32 +0200 |
| commit | b5f966ceb57b1d45f8c01b16f049fdea17f54a0d (patch) | |
| tree | e8a660ecdfc79e99c2ba95723971218e78aacf8c /engines | |
| parent | 3b076459914d8f9cbc1db2e6def6c5ce952e3ffe (diff) | |
| download | scummvm-rg350-b5f966ceb57b1d45f8c01b16f049fdea17f54a0d.tar.gz scummvm-rg350-b5f966ceb57b1d45f8c01b16f049fdea17f54a0d.tar.bz2 scummvm-rg350-b5f966ceb57b1d45f8c01b16f049fdea17f54a0d.zip | |
SHERLOCK: events delay quit event
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/events.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } } |