[Scummvm-cvs-logs] scummvm master -> 5ec6f572c1b7888b4111566fcf6727ade3f043ea

sev- sev at scummvm.org
Fri Aug 19 23:18:47 CEST 2016


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:
5ec6f572c1 TITANIC: Fix infinite recursion


Commit: 5ec6f572c1b7888b4111566fcf6727ade3f043ea
    https://github.com/scummvm/scummvm/commit/5ec6f572c1b7888b4111566fcf6727ade3f043ea
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-19T23:18:29+02:00

Commit Message:
TITANIC: Fix infinite recursion

Changed paths:
    engines/titanic/carry/phonograph_ear.cpp



diff --git a/engines/titanic/carry/phonograph_ear.cpp b/engines/titanic/carry/phonograph_ear.cpp
index 9cd461d..95297a7 100644
--- a/engines/titanic/carry/phonograph_ear.cpp
+++ b/engines/titanic/carry/phonograph_ear.cpp
@@ -53,7 +53,7 @@ bool CPhonographEar::PETGainedObjectMsg(CPETGainedObjectMsg *msg) {
 		addTimer(1000);
 	}
 
-	return PETGainedObjectMsg(msg);
+	return CEar::PETGainedObjectMsg(msg);
 }
 
 bool CPhonographEar::TimerMsg(CTimerMsg *msg) {






More information about the Scummvm-git-logs mailing list