From fe2ab0f3b77cb8f0b0f648c82680587e35bf9103 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Oct 2016 07:54:52 -0400
Subject: TITANIC: Fix infinite recursion loading object resources

---
 engines/titanic/core/game_object.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a1b86e3520..92c7e948c8 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();
 	}
 
-- 
cgit v1.2.3