From 256bf62ee4d9822458a721c059fe4abbef8ca1df Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 1 Feb 2014 11:54:33 -0500
Subject: VOYEUR: Refactored audio scene playback, and fixed a crash at the end

---
 engines/voyeur/files_threads.cpp | 1 +
 engines/voyeur/voyeur.cpp        | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 3e2fa6f7bc..8359cf88fb 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -391,6 +391,7 @@ void ThreadResource::parsePlayCommands() {
 					_vm->_voy.addAudioEventEnd();
 					_vm->_eventsManager.incrementTime(1);
 					_vm->_eventsManager.incrementTime(1);
+					_vm->_audioVideoId = -1;
 					parseIndex = 999;
 				}				
 			} 
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 932a38e60d..2898c16592 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -621,10 +621,9 @@ void VoyeurEngine::playAudio(int audioId) {
 	_soundManager.stopVOCPlay();
 
 	_bVoy->freeBoltGroup(0x7F00);
-	flipPageAndWait();
+	(*_graphicsManager._vPort)->setupViewPort(NULL);
 
 	_voy._field478 &= ~0x10;
-	audioId = -1;
 	_voy._field470 = 129;
 }
 
-- 
cgit v1.2.3