[Scummvm-cvs-logs] SF.net SVN: scummvm:[44274] scummvm/trunk/engines/scumm

[aquadran at users.sourceforge.net]

Revision: 44274
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44274&view=rev
Author:   aquadran
Date:     2009-09-23 13:22:12 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
fix for bug #2820389

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
    scummvm/trunk/engines/scumm/scumm_v7.h

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2009-09-23 13:17:08 UTC (rev 44273)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2009-09-23 13:22:12 UTC (rev 44274)
@@ -203,6 +203,11 @@
 	debug(6, "refreshScripts()");
 
 	if (_stopingSequence) {
+		// prevent start new music, only fade out old one
+		if (_vm->isSmushActive()) {
+			fadeOutMusic(60);
+			return;
+		}
 		// small delay, it seems help for fix bug #1757010
 		if (_stopingSequence++ > 120) {
 			debug(5, "refreshScripts() Force restore music state");

Modified: scummvm/trunk/engines/scumm/scumm_v7.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm_v7.h	2009-09-23 13:17:08 UTC (rev 44273)
+++ scummvm/trunk/engines/scumm/scumm_v7.h	2009-09-23 13:22:12 UTC (rev 44274)
@@ -97,6 +97,7 @@
 	void addSubtitleToQueue(const byte *text, const Common::Point &pos, byte color, byte charset);
 	void clearSubtitleQueue();
 	virtual void CHARSET_1();
+	bool isSmushActive() { return _smushActive; }
 
 protected:
 	virtual int runDialog(Dialog &dialog);


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