From a7a8b49567c8565d63532f7d039d61f045cf8bab Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 3 Jul 2014 20:37:08 -0400
Subject: VOYEUR: Fix double apartment enter animation when loading save from
 launcher

---
 engines/voyeur/files_threads.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/voyeur')

diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 256aedf50e..0615c67ba0 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1007,8 +1007,10 @@ int ThreadResource::doApt() {
 
 		if (_vm->_loadGameSlot != -1) {
 			// Load a savegame
-			_vm->loadGame(_vm->_loadGameSlot);
+			int slot = _vm->_loadGameSlot;
 			_vm->_loadGameSlot = -1;
+			_vm->loadGame(slot);
+
 			_vm->_eventsManager->showCursor();
 		}
 
@@ -1597,7 +1599,9 @@ void ThreadResource::loadTheApt() {
 		_vm->_voy->_aptLoadMode = -1;
 
 	if (_vm->_voy->_aptLoadMode  != -1) {
-		doAptAnim(1);
+		if (_vm->_loadGameSlot != -1)
+			doAptAnim(1);
+
 		_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
 		_vm->_voy->_aptLoadMode = -1;
 		_vm->_graphicsManager->_backgroundPage = _vm->_bVoy->boltEntry(
-- 
cgit v1.2.3