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

[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:
fe2ab0f3b7 TITANIC: Fix infinite recursion loading object resources


Commit: fe2ab0f3b77cb8f0b0f648c82680587e35bf9103
    https://github.com/scummvm/scummvm/commit/fe2ab0f3b77cb8f0b0f648c82680587e35bf9103
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-29T07:54:52-04:00

Commit Message:
TITANIC: Fix infinite recursion loading object resources

Changed paths:
    engines/titanic/core/game_object.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a1b86e3..92c7e94 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -403,8 +403,11 @@ void CGameObject::loadImage(const CString &name, bool pendingFlag) {
 
 void CGameObject::loadFrame(int frameNumber) {
 	_frameNumber = -1;
-	if (!_resource.empty())
+
+	if (!_surface && !_resource.empty()) {
 		loadResource(_resource);
+		_resource.clear();
+	}
 
 	if (_surface)
 		_surface->setMovieFrame(frameNumber);
@@ -612,9 +615,8 @@ void CGameObject::playMovie(uint flags) {
 void CGameObject::playMovie(int startFrame, int endFrame, uint flags) {
 	_frameNumber = -1;
 
-	if (!_surface) {
-		if (!_resource.empty())
-			loadResource(_resource);
+	if (!_surface && !_resource.empty()) {
+		loadResource(_resource);
 		_resource.clear();
 	}
 
@@ -630,9 +632,8 @@ void CGameObject::playMovie(int startFrame, int endFrame, uint flags) {
 void CGameObject::playMovie(int startFrame, int endFrame, int initialFrame, uint flags) {
 	_frameNumber = -1;
 
-	if (!_surface) {
-		if (!_resource.empty())
-			loadResource(_resource);
+	if (!_surface && !_resource.empty()) {
+		loadResource(_resource);
 		_resource.clear();
 	}