[Scummvm-cvs-logs] scummvm master -> 850ddc14627c910c53111b57e30d2e044841e046

clone2727 clone2727 at gmail.com
Sun Apr 20 18:58:42 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
850ddc1462 PEGASUS: Fix disabling input when the rip first hits


Commit: 850ddc14627c910c53111b57e30d2e044841e046
    https://github.com/scummvm/scummvm/commit/850ddc14627c910c53111b57e30d2e044841e046
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-04-20T12:55:52-04:00

Commit Message:
PEGASUS: Fix disabling input when the rip first hits

Changed paths:
    engines/pegasus/neighborhood/tsa/fulltsa.cpp



diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index c0fa3c4..92b79c0 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -1692,7 +1692,9 @@ void FullTSA::initializeTBPMonitor(const int newMode, const ExtraID highlightExt
 		releaseSprites();
 	}
 
-	_interruptionFilter = kFilterAllInput;
+	// Only allow input if we're not in the middle of series of queue requests.
+	if (actionQueueEmpty())
+		_interruptionFilter = kFilterAllInput;
 }
 
 void FullTSA::startUpComparisonMonitor() {






More information about the Scummvm-git-logs mailing list