[Scummvm-cvs-logs] scummvm master -> 5fc9831577858a15ee323b41a1b9e6d01c444118

bluegr md5 at scummvm.org
Thu Nov 17 10:00:43 CET 2011


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:
5fc9831577 SCI: Fixed bug #3439240 - "QFG1VGA:  Game Crashes While Sleeping at Erana's Peace"


Commit: 5fc9831577858a15ee323b41a1b9e6d01c444118
    https://github.com/scummvm/scummvm/commit/5fc9831577858a15ee323b41a1b9e6d01c444118
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-17T01:00:09-08:00

Commit Message:
SCI: Fixed bug #3439240 - "QFG1VGA:  Game Crashes While Sleeping at Erana's Peace"

Changed paths:
    engines/sci/graphics/palette.cpp



diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index a7a5dc9..b8a4248 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -709,6 +709,11 @@ bool GfxPalette::palVaryLoadTargetPalette(GuiResourceId resourceId) {
 }
 
 void GfxPalette::palVaryInstallTimer() {
+	// Remove any possible leftover palVary timer callbacks.
+	// This happens for example in QFG1VGA, when sleeping at Erana's place
+	// (bug #3439240).
+	palVaryRemoveTimer();
+
 	int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
 	// Call signal increase every [ticks]
 	g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette");






More information about the Scummvm-git-logs mailing list