[Scummvm-cvs-logs] SF.net SVN: scummvm:[54749] scummvm/branches/branch-1-2-0/engines/ parallaction/gui_ns.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Fri Dec 3 12:36:38 CET 2010


Revision: 54749
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54749&view=rev
Author:   drmccoy
Date:     2010-12-03 11:36:36 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
Backport: Initialize variable in NS gui code (was crashing a demo). Patch #3089932 by fuzzie.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/parallaction/gui_ns.cpp

Modified: scummvm/branches/branch-1-2-0/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/parallaction/gui_ns.cpp	2010-12-03 09:33:51 UTC (rev 54748)
+++ scummvm/branches/branch-1-2-0/engines/parallaction/gui_ns.cpp	2010-12-03 11:36:36 UTC (rev 54749)
@@ -118,6 +118,7 @@
 	ChooseLanguageInputState_NS(Parallaction *vm, MenuInputHelper *helper) : MenuInputState("chooselanguage", helper), _vm(vm) {
 		_allowChoice = false;
 		_nextState = "selectgame";
+		_label = 0;
 
 		_dosLanguageSelectBlocks[0] = Common::Rect(  80, 110, 128, 180 );	// Italian
 		_dosLanguageSelectBlocks[1] = Common::Rect( 129,  85, 177, 155 );	// French
@@ -147,7 +148,6 @@
 			_blocks = _dosLanguageSelectBlocks;
 		}
 
-		_label = 0;
 		_language = -1;
 		_allowChoice = true;
 	}


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