[Scummvm-git-logs] scummvm master -> deab63fbdde7cbaa336000110ccb5eb2b7f06c80

[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:
deab63fbdd TITANIC: Fix resetting _movieRoom when changing views


Commit: deab63fbdde7cbaa336000110ccb5eb2b7f06c80
    https://github.com/scummvm/scummvm/commit/deab63fbdde7cbaa336000110ccb5eb2b7f06c80
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-20T21:55:52-04:00

Commit Message:
TITANIC: Fix resetting _movieRoom when changing views

Changed paths:
    engines/titanic/game_manager.cpp


diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index d6cc7d1..047ecf7 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -136,6 +136,7 @@ void CGameManager::roomTransition(CRoomItem *oldRoom, CRoomItem *newRoom) {
 		_movieRoom = oldRoom;
 	} else {
 		movieKey = oldRoom->getExitMovieKey();
+		_movieRoom = nullptr;
 	}
 
 	CString filename = movieKey.getFilename();