[Scummvm-cvs-logs] SF.net SVN: scummvm:[55849] scummvm/trunk/engines/sci/engine/seg_manager. cpp

waltervn at users.sourceforge.net waltervn at users.sourceforge.net
Wed Feb 9 01:27:50 CET 2011


Revision: 55849
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55849&view=rev
Author:   waltervn
Date:     2011-02-09 00:27:50 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
SCI: Do not try to dereference object name when it's not a pointer.

Stops flood of warnings in some Mac titles.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2011-02-09 00:24:06 UTC (rev 55848)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2011-02-09 00:27:50 UTC (rev 55849)
@@ -254,7 +254,9 @@
 	if (nameReg.isNull())
 		return "<no name>";
 
-	const char *name = derefString(nameReg);
+	const char *name = 0;
+	if (nameReg.segment)
+		name  = derefString(nameReg);
 	if (!name)
 		return "<invalid name>";
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list