From 27e141eaf4686a652c3a196263e64d082702a2cb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 6 Aug 2017 23:02:55 -0400
Subject: VOYEUR: Fix exiting game from the VCR screen

---
 engines/voyeur/events.cpp      | 2 +-
 engines/voyeur/voyeur_game.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/voyeur')

diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 020fe4b692..ae7e300979 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -245,7 +245,7 @@ void EventsManager::pollEvents() {
 	checkForNextFrameCounter();
 
 	Common::Event event;
-	while (g_system->getEventManager()->pollEvent(event)) {
+	while (g_system->getEventManager()->pollEvent(event) && !_vm->shouldQuit()) {
 		// Handle keypress
 		switch (event.type) {
 		case Common::EVENT_QUIT:
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 2c84a4c471..7ffba7f338 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -61,6 +61,8 @@ void VoyeurEngine::playStamp() {
 		switch (_voy->_playStampMode) {
 		case 5:
 			buttonId = _mainThread->doInterface();
+			if (shouldQuit())
+				return;
 
 			if (buttonId == -2) {
 				switch (_mainThread->doApt()) {
@@ -647,6 +649,9 @@ void VoyeurEngine::reviewTape() {
 
 		} while (!shouldQuit() && (!_eventsManager->_mouseClicked || foundIndex == -1));
 
+		if (shouldQuit())
+			return;
+
 		newY = _eventsManager->getMousePos().y;
 		_voy->_fadingType = 0;
 		_voy->_viewBounds = nullptr;
-- 
cgit v1.2.3