[Scummvm-cvs-logs] SF.net SVN: scummvm:[46062] scummvm/trunk/engines/teenagent/scene.cpp

[megath at users.sourceforge.net]

Revision: 46062
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46062&view=rev
Author:   megath
Date:     2009-11-22 08:27:41 +0000 (Sun, 22 Nov 2009)

Log Message:
-----------
do not decrement timer while scene is busy

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/scene.cpp

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-22 08:20:20 UTC (rev 46061)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-22 08:27:41 UTC (rev 46062)
@@ -743,7 +743,7 @@
 			}
 		}
 		
-		if (callback_timer) {
+		if (!busy && !restart && callback_timer) {
 			if (--callback_timer == 0) {
 				if (_engine->inventory->active())
 					_engine->inventory->activate(false);


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