From 5fc9831577858a15ee323b41a1b9e6d01c444118 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 17 Nov 2011 11:00:09 +0200
Subject: SCI: Fixed bug #3439240 - "QFG1VGA:  Game Crashes While Sleeping at
 Erana's Peace"

---
 engines/sci/graphics/palette.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index a7a5dc94d1..b8a4248c93 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");
-- 
cgit v1.2.3