[Scummvm-cvs-logs] SF.net SVN: scummvm: [23524] scummvm/trunk/engines/sword2/animation.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:52:01 CEST 2006


Revision: 23524
          http://svn.sourceforge.net/scummvm/?rev=23524&view=rev
Author:   eriktorbjorn
Date:     2006-07-15 16:18:11 -0700 (Sat, 15 Jul 2006)

Log Message:
-----------
Fixed regression: Test if there's a text object to close before closing it.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.cpp

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2006-07-15 22:42:28 UTC (rev 23523)
+++ scummvm/trunk/engines/sword2/animation.cpp	2006-07-15 23:18:11 UTC (rev 23524)
@@ -401,7 +401,9 @@
 	}
 
 	// The current text object may still be open
-	closeTextObject(_textList[_currentText]);
+	if (_textList && _textList[_currentText]) {
+		closeTextObject(_textList[_currentText]);
+	}
 
 	if (!terminate) {
 		// Wait for the voice to stop playing. This is to make sure






More information about the Scummvm-git-logs mailing list