Merge branch 'master'

1 files changed, 8 insertions, 1 deletions

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b52af38675..47d1647c6c 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -709,6 +709,13 @@ 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) - the nighttime to daytime effect clashes with the
+	// scene transition effect, as we load scene images too quickly for
+	// the SCI scripts in that case (also refer to kernelPalVaryInit).
+	palVaryRemoveTimer();
+
 	int16 ticks = _palVaryTicks > 0 ? _palVaryTicks : 1;
 	// Call signal increase every [ticks]
 	g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this, "sciPalette");
@@ -966,7 +973,7 @@ void GfxPalette::loadMacIconBarPalette() {
 }
 
 bool GfxPalette::colorIsFromMacClut(byte index) {
-	return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 1] != 0);
+	return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 2] != 0);
 }
 
 #ifdef ENABLE_SCI32