[Scummvm-git-logs] scummvm master -> b9cede269b33762d2d79b08520193751c3da271a

[eriktorbjorn]

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:
b9cede269b SCUMM: Fix regression with MI1 SegaCD savegame loading


Commit: b9cede269b33762d2d79b08520193751c3da271a
    https://github.com/scummvm/scummvm/commit/b9cede269b33762d2d79b08520193751c3da271a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-03-21T07:30:08+01:00

Commit Message:
SCUMM: Fix regression with MI1 SegaCD savegame loading

We're no longer guaranteed to have a _musicEngine, and while that may
once again change it's probably still a good idea to check.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 234941ef238..614d3e0c6c9 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3625,7 +3625,7 @@ void ScummEngine_v3::scummLoop_handleSaveLoad() {
 			redrawVerbs();
 		}
 
-		if (restoreSounds)
+		if (_musicEngine && restoreSounds)
 			_musicEngine->restoreAfterLoad();
 	}
 }
@@ -3690,7 +3690,8 @@ void ScummEngine_v5::scummLoop_handleSaveLoad() {
 		clearCharsetMask();
 		_charset->_hasMask = false;
 
-		_musicEngine->restoreAfterLoad();
+		if (_musicEngine)
+			_musicEngine->restoreAfterLoad();
 
 		redrawVerbs();