[Scummvm-cvs-logs] scummvm master -> a7a8b49567c8565d63532f7d039d61f045cf8bab

[dreammaster]

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:
a7a8b49567 VOYEUR: Fix double apartment enter animation when loading save from launcher


Commit: a7a8b49567c8565d63532f7d039d61f045cf8bab
    https://github.com/scummvm/scummvm/commit/a7a8b49567c8565d63532f7d039d61f045cf8bab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-07-03T20:37:08-04:00

Commit Message:
VOYEUR: Fix double apartment enter animation when loading save from launcher

Changed paths:
    engines/voyeur/files_threads.cpp



diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 256aedf..0615c67 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(