[Scummvm-cvs-logs] SF.net SVN: scummvm:[48381] scummvm/trunk/engines/queen/music.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 48381
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48381&view=rev
Author:   eriktorbjorn
Date:     2010-03-24 17:46:35 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/queen/music.cpp

Modified: scummvm/trunk/engines/queen/music.cpp
===================================================================
--- scummvm/trunk/engines/queen/music.cpp	2010-03-24 16:40:35 UTC (rev 48380)
+++ scummvm/trunk/engines/queen/music.cpp	2010-03-24 17:46:35 UTC (rev 48381)
@@ -309,6 +309,8 @@
 		size = packedSize * 2;
 	}
 
+	stopMusic();
+
 	_mutex.lock();
 	_parser->loadMusic(musicPtr, size);
 	_parser->setTrack(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.