[Scummvm-cvs-logs] scummvm master -> bb2b1c8dfe4bdf7b54f7a704bfb632e3671f4da4

clone2727 clone2727 at gmail.com
Mon Nov 25 04:55:36 CET 2013


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:
bb2b1c8dfe PEGASUS: Reset the callback trigger in disposeCallBack()


Commit: bb2b1c8dfe4bdf7b54f7a704bfb632e3671f4da4
    https://github.com/scummvm/scummvm/commit/bb2b1c8dfe4bdf7b54f7a704bfb632e3671f4da4
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-11-24T19:53:55-08:00

Commit Message:
PEGASUS: Reset the callback trigger in disposeCallBack()

Fixes the occasional "loop" when finishing the space chase. Thanks to blitter for actually being able to trigger and debug the damned problem

Changed paths:
    engines/pegasus/timers.cpp



diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp
index 8463d86..5fb2551 100644
--- a/engines/pegasus/timers.cpp
+++ b/engines/pegasus/timers.cpp
@@ -333,6 +333,7 @@ void TimeBaseCallBack::releaseCallBack() {
 
 void TimeBaseCallBack::disposeCallBack() {
 	_timeBase = 0;
+	_trigger = kTriggerNone;
 	_hasBeenTriggered = false;
 }
 






More information about the Scummvm-git-logs mailing list