[Scummvm-cvs-logs] scummvm master -> b419f739734b5f63cd4b6cf241b0a36a4fb6c7be

[criezy]

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:
b419f73973 CGE: Fix issue with music not stopping when reloading game


Commit: b419f739734b5f63cd4b6cf241b0a36a4fb6c7be
    https://github.com/scummvm/scummvm/commit/b419f739734b5f63cd4b6cf241b0a36a4fb6c7be
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2011-12-06T23:59:19-08:00

Commit Message:
CGE: Fix issue with music not stopping when reloading game

If you turn off the music and then save a game, then turn on the music
again and then load the saved game, the music from the scene continue
to play despite the _music flag being false. So the first time you click on
the music on/off button the music restart and only the second time
does it stop. This fixes the bug by stoping the music before reloading
a game.

Changed paths:
    engines/cge/cge_main.cpp



diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index c8ff1ee..fd7dd85 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -279,6 +279,10 @@ Common::Error CGEEngine::loadGameState(int slot) {
 	sceneDown();
 	_hero->park();
 	resetGame();
+	
+	// If music is playing, kill it.
+	if (_music)
+		_midiPlayer->killMidi();
 
 	// Load the game
 	loadGame(slot, NULL);