[Scummvm-cvs-logs] SF.net SVN: scummvm:[52859] scummvm/branches/branch-1-2-0/engines/agi/inv. cpp

tdhs at users.sourceforge.net tdhs at users.sourceforge.net
Wed Sep 22 23:13:13 CEST 2010


Revision: 52859
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52859&view=rev
Author:   tdhs
Date:     2010-09-22 21:13:13 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
AGI: Backport of r52856 : Fix for Bug #3067263 "SQ2: ScummVM hanging on the inventory screen"

This was due to a loop in AgiEngine::selectItems(int n), which lacked a check
that the engine was quitting or restarting.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/agi/inv.cpp

Modified: scummvm/branches/branch-1-2-0/engines/agi/inv.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/inv.cpp	2010-09-22 20:37:03 UTC (rev 52858)
+++ scummvm/branches/branch-1-2-0/engines/agi/inv.cpp	2010-09-22 21:13:13 UTC (rev 52859)
@@ -114,7 +114,7 @@
 	int fsel = 0;
 	bool exit_select = false;
 
-	while (!exit_select) {
+	while (!exit_select && !(shouldQuit() || _restartGame)) {
 		if (n > 0)
 			printItem(fsel, STATUS_BG, STATUS_FG);
 


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