[Scummvm-git-logs] scummvm master -> 9bf01106fd01f3c647620dce062fd383f8cb50dd

[dreammaster]

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:
9bf01106fd MM: MM1: Fix crash on startup


Commit: 9bf01106fd01f3c647620dce062fd383f8cb50dd
    https://github.com/scummvm/scummvm/commit/9bf01106fd01f3c647620dce062fd383f8cb50dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-01T21:55:58-07:00

Commit Message:
MM: MM1: Fix crash on startup

Changed paths:
    engines/mm/mm1/mm1.cpp
    engines/mm/shared/xeen/sound.cpp


diff --git a/engines/mm/mm1/mm1.cpp b/engines/mm/mm1/mm1.cpp
index 9ab7ce7331a..4def98e59b3 100644
--- a/engines/mm/mm1/mm1.cpp
+++ b/engines/mm/mm1/mm1.cpp
@@ -62,10 +62,6 @@ Common::Error MM1Engine::run() {
 	// Initialize graphics mode
 	initGraphics(320, 200);
 
-	// Setup mixer
-	_sound = new Sound(_mixer);
-	syncSoundSettings();
-
 	if (isEnhanced()) {
 		if (!setupEnhanced())
 			return Common::kNoError;
@@ -73,6 +69,10 @@ Common::Error MM1Engine::run() {
 		setupNormal();
 	}
 
+	// Setup mixer
+	_sound = new Sound(_mixer);
+	syncSoundSettings();
+
 	// Setup console
 	setDebugger(new Console());
 	if (gDebugLevel > 0)
diff --git a/engines/mm/shared/xeen/sound.cpp b/engines/mm/shared/xeen/sound.cpp
index a9869e597a1..cff544b633a 100644
--- a/engines/mm/shared/xeen/sound.cpp
+++ b/engines/mm/shared/xeen/sound.cpp
@@ -50,8 +50,9 @@ _musicVolume(0), _sfxVolume(0) {
 		break;
 	}
 
-	// force load effects early so custom instruments for mt32 are loaded before sound is played.
-	loadEffectsData();
+	if (g_engine->getGameID() != GType_MightAndMagic1)
+		// Force load effects early so custom instruments for mt32 are loaded before sound is played.
+		loadEffectsData();
 
 	assert(_SoundDriver);