[Scummvm-cvs-logs] scummvm master -> 2ab0b71fd04d817740826c28ce29b9945176b684

[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:
2ab0b71fd0 SHERLOCK: RT: Fix playing music when displaying the map


Commit: 2ab0b71fd04d817740826c28ce29b9945176b684
    https://github.com/scummvm/scummvm/commit/2ab0b71fd04d817740826c28ce29b9945176b684
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-29T07:41:59-04:00

Commit Message:
SHERLOCK: RT: Fix playing music when displaying the map

Changed paths:
    engines/sherlock/tattoo/tattoo_map.cpp



diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp
index beafa93..4bd85bd 100644
--- a/engines/sherlock/tattoo/tattoo_map.cpp
+++ b/engines/sherlock/tattoo/tattoo_map.cpp
@@ -69,7 +69,7 @@ int TattooMap::show() {
 		}
 	}
 
-	if (music._midiOption) {
+	if (music._musicOn) {
 		// See if Holmes or Watson is the active character	
 		Common::String song;
 		if (_vm->readFlags(FLAG_PLAYER_IS_HOLMES))
@@ -81,8 +81,7 @@ int TattooMap::show() {
 			song = "Cue7";
 
 		if (music.loadSong(song)) {
-			if (music._musicOn)
-				music.startSong();
+			music.startSong();
 		}
 	}