[Scummvm-git-logs] scummvm branch-2-5 -> 06aedde33e4e09fc2eff8c0019f836104477bbdc

[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:
06aedde33e KYRA: (LoK) - fix invalid mem access when quitting after being turned to stone


Commit: 06aedde33e4e09fc2eff8c0019f836104477bbdc
    https://github.com/scummvm/scummvm/commit/06aedde33e4e09fc2eff8c0019f836104477bbdc
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-17T01:52:42+01:00

Commit Message:
KYRA: (LoK) - fix invalid mem access when quitting after being turned to stone

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


diff --git a/engines/kyra/engine/kyra_lok.cpp b/engines/kyra/engine/kyra_lok.cpp
index 090d62efe0..ed0dd3d160 100644
--- a/engines/kyra/engine/kyra_lok.cpp
+++ b/engines/kyra/engine/kyra_lok.cpp
@@ -432,6 +432,7 @@ void KyraEngine_LoK::mainLoop() {
 	static_cast<Debugger_LoK *>(getDebugger())->initialize();
 
 	_eventList.clear();
+	bool updateGfx = true;
 
 	while (!shouldQuit()) {
 		int32 frameTime = (int32)_system->getMillis();
@@ -447,7 +448,8 @@ void KyraEngine_LoK::mainLoop() {
 			snd_playSoundEffect(49);
 			_screen->setMouseCursor(1, 1, _shapes[0]);
 			removeHandItem();
-			_gui->buttonMenuCallback(0);
+			_gui->buttonMenuCallback(nullptr);
+			updateGfx = !shouldQuit();
 			_deathHandler = -1;
 		}
 
@@ -476,7 +478,7 @@ void KyraEngine_LoK::mainLoop() {
 		if (skipFlag())
 			resetSkipFlag();
 
-		delay((frameTime + _gameSpeed) - _system->getMillis(), true, true);
+		delay((frameTime + _gameSpeed) - _system->getMillis(), updateGfx, true);
 	}
 }