[Scummvm-git-logs] scummvm master -> 387283755b6d1a327aa2f82d6d2ea5b4c2bf8830

[djsrv]

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:
387283755b DIRECTOR: LINGO: Don't process event when stopping


Commit: 387283755b6d1a327aa2f82d6d2ea5b4c2bf8830
    https://github.com/scummvm/scummvm/commit/387283755b6d1a327aa2f82d6d2ea5b4c2bf8830
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-17T11:51:11-04:00

Commit Message:
DIRECTOR: LINGO: Don't process event when stopping

Changed paths:
    engines/director/lingo/lingo-events.cpp
    engines/director/lingo/lingo.cpp


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index c50e6a3245..a2a9a3cbcd 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -309,6 +309,10 @@ void Lingo::processEvent(LEvent event) {
 void Lingo::processEvents() {
 	while (!_eventQueue.empty()) {
 		LingoEvent el = _eventQueue.pop();
+
+		if (_vm->getCurrentScore()->_stopPlay && el.event != kEventStopMovie)
+			continue;
+
 		processEvent(el.event, el.st, el.entityId, el.channelId);
 	}
 }
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index b43aa539f7..23a6f497d0 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -569,6 +569,7 @@ void Lingo::execute(uint pc) {
 
 		if (++counter > 1000 && debugChannelSet(-1, kDebugFewFramesOnly)) {
 			warning("Lingo::execute(): Stopping due to debug few frames only");
+			_vm->getCurrentScore()->_stopPlay = true;
 			break;
 		}
 	}