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

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
aee2c49413 MM: MM1: Stop most recent music playing after opening/closing the GMM


Commit: aee2c4941361765711ca923d11d1d138da5d6e56
    https://github.com/scummvm/scummvm/commit/aee2c4941361765711ca923d11d1d138da5d6e56
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-10T08:46:43+10:00

Commit Message:
MM: MM1: Stop most recent music playing after opening/closing the GMM

Changed paths:
    NEWS.md
    engines/mm/shared/xeen/sound.cpp
    engines/mm/shared/xeen/sound.h


diff --git a/NEWS.md b/NEWS.md
index 126806cdf0a..20b50330d50 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -30,6 +30,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Reworked keymapper for MM1.
    - Fixed MM1 Enhanced allowing trading more than the character owned.
    - Fixed MM1 Enhanced allowing free temple healing where it shouldn't.
+   - MM1 Enhanced most recently played music was restarting after opening and closing the GMM.
 
  SLUDGE:
    - Added two more games to detection, "Sam and Max Flintlocked" and
diff --git a/engines/mm/shared/xeen/sound.cpp b/engines/mm/shared/xeen/sound.cpp
index 82793b949cd..6e126b3b836 100644
--- a/engines/mm/shared/xeen/sound.cpp
+++ b/engines/mm/shared/xeen/sound.cpp
@@ -293,7 +293,6 @@ void Sound::playSong(Common::SeekableReadStream &stream) {
 void Sound::playSong(const Common::Path &name, int param) {
 	if (isMusicPlaying() && name == _currentMusic)
 		return;
-	_currentMusic = name;
 
 	Common::File mf;
 	if (mf.open(name)) {
@@ -307,6 +306,8 @@ void Sound::playSong(const Common::Path &name, int param) {
 		File f(name);
 		playSong(f);
 	}
+
+	_currentMusic = name;
 }
 
 void Sound::setMusicOn(bool isOn) {
diff --git a/engines/mm/shared/xeen/sound.h b/engines/mm/shared/xeen/sound.h
index cd6689bf9da..4f1673faa20 100644
--- a/engines/mm/shared/xeen/sound.h
+++ b/engines/mm/shared/xeen/sound.h
@@ -88,6 +88,7 @@ public:
 	 * Stops any currently playing music
 	 */
 	void stopSong() {
+		_currentMusic.clear();
 		songCommand(STOP_SONG);
 	}