[Scummvm-git-logs] scummvm master -> 50fe417e1314e172545935d30b55456803b6fc92

[athrxx]

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:
50fe417e13 KYRA: fix bug no. 15270 ("Crash in Alpinia")


Commit: 50fe417e1314e172545935d30b55456803b6fc92
    https://github.com/scummvm/scummvm/commit/50fe417e1314e172545935d30b55456803b6fc92
Author: athrxx (athrxx at scummvm.org)
Date: 2024-07-17T17:44:04+02:00

Commit Message:
KYRA: fix bug no. 15270 ("Crash in Alpinia")

Changed paths:
    engines/kyra/engine/scene_hof.cpp


diff --git a/engines/kyra/engine/scene_hof.cpp b/engines/kyra/engine/scene_hof.cpp
index f0741f919ba..c17bc406580 100644
--- a/engines/kyra/engine/scene_hof.cpp
+++ b/engines/kyra/engine/scene_hof.cpp
@@ -672,7 +672,7 @@ void KyraEngine_HoF::freeSceneShapePtrs() {
 
 void KyraEngine_HoF::fadeScenePal(int srcIndex, int delayTime) {
 	_screen->getPalette(0).copy(_scenePal, srcIndex << 4, 16, 112);
-	_screen->fadePalette(_screen->getPalette(0), delayTime, &_updateFunctor);
+	_screen->fadePalette(_screen->getPalette(0), delayTime, delayTime ? &_updateFunctor : nullptr);
 }
 
 #pragma mark -