aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-03-24 17:46:35 +0000
committerTorbjörn Andersson2010-03-24 17:46:35 +0000
commit55fb1225c865998451707a1a48250d7641ce5ae2 (patch)
tree5c154d8e5ad8b8751a220c78958b48d3edf3b5a0 /engines/queen
parentd377ef562653e435c02aa9a439deb39ecbacf3aa (diff)
downloadscummvm-rg350-55fb1225c865998451707a1a48250d7641ce5ae2.tar.gz
scummvm-rg350-55fb1225c865998451707a1a48250d7641ce5ae2.tar.bz2
scummvm-rg350-55fb1225c865998451707a1a48250d7641ce5ae2.zip
Stop the music before starting the next one, after discussing it with joostp.
This should fix bug #2961891 ("FOTAQ: Floda Alarm Tone Won't Stop"). It's probably too late to get this into the branch - at least before the release - since it's not a particularly serious bug. svn-id: r48381
Diffstat (limited to 'engines/queen')
-rw-r--r--engines/queen/music.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp
index bd8e73657e..b4b9210616 100644
--- a/engines/queen/music.cpp
+++ b/engines/queen/music.cpp
@@ -309,6 +309,8 @@ void MidiMusic::playMusic() {
size = packedSize * 2;
}
+ stopMusic();
+
_mutex.lock();
_parser->loadMusic(musicPtr, size);
_parser->setTrack(0);