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

[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:
ff9c0a9a89 TITANIC: Fix crash exiting game when music room music is active


Commit: ff9c0a9a8906e54845d9dd917007a6c29bf1aaf7
    https://github.com/scummvm/scummvm/commit/ff9c0a9a8906e54845d9dd917007a6c29bf1aaf7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-15T21:14:33-04:00

Commit Message:
TITANIC: Fix crash exiting game when music room music is active

Changed paths:
    engines/titanic/game_manager.h
    engines/titanic/sound/music_room_handler.cpp


diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h
index 89c40d0..c319e18 100644
--- a/engines/titanic/game_manager.h
+++ b/engines/titanic/game_manager.h
@@ -81,8 +81,8 @@ public:
 	CInputHandler _inputHandler;
 	CInputTranslator _inputTranslator;
 	CTreeItem *_dragItem;
-	CMusicRoom _musicRoom;
 	CSound _sound;
+	CMusicRoom _musicRoom;
 public:
 	CGameManager(CProjectItem *project, CGameView *gameView, Audio::Mixer *mixer);
 	~CGameManager();
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index 680dfed..2265e46 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -239,14 +239,11 @@ void CMusicRoomHandler::updateAudio() {
 		// Reaching end of music
 		_audioBuffer->finalize();
 }
-bool flag = false;
+
 void CMusicRoomHandler::updateInstruments() {
 	uint currentTicks = g_system->getMillis();
 
 	if (_active && _soundStartTicks) {
-		if (!flag) {
-			flag = true; warning("STARTING TICKS %d", currentTicks);//***DEBUG***/
-		}
 		for (MusicInstrument instrument = BELLS; instrument <= BASS;
 				instrument = (MusicInstrument)((int)instrument + 1)) {
 			MusicRoomInstrument &ins1 = _array1[instrument];