[Scummvm-cvs-logs] SF.net SVN: scummvm:[48414] scummvm/branches/branch-1-1-0/engines/queen/ music.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 48414
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48414&view=rev
Author:   eriktorbjorn
Date:     2010-03-28 21:10:47 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
Backported fix for bug #2961891 ("FOTAQ: Floda Alarm Tone Won't Stop"). I've
played through the whole game without noticing any problems. The music did go
out at some point (points?) in the temple on the island, but that also happened
when playing through that part with 1.0 so I don't think it's a regression.
(For reference, in 1.0 it happened shortly after getting the big stick.)

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/engines/queen/music.cpp

Modified: scummvm/branches/branch-1-1-0/engines/queen/music.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/queen/music.cpp	2010-03-27 22:02:05 UTC (rev 48413)
+++ scummvm/branches/branch-1-1-0/engines/queen/music.cpp	2010-03-28 21:10:47 UTC (rev 48414)
@@ -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.