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

[jvprat at users.sourceforge.net]

Revision: 48147
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48147&view=rev
Author:   jvprat
Date:     2010-02-27 15:54:31 +0000 (Sat, 27 Feb 2010)

Log Message:
-----------
DRACI: Don't try to set the volume for channels that couldn't be allocated (fixes bug #2907954: "DRAGON: Crash in Intro")

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

Modified: scummvm/trunk/engines/draci/music.cpp
===================================================================
--- scummvm/trunk/engines/draci/music.cpp	2010-02-27 11:44:35 UTC (rev 48146)
+++ scummvm/trunk/engines/draci/music.cpp	2010-02-27 15:54:31 UTC (rev 48147)
@@ -127,7 +127,8 @@
 		_channel[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel();
 		// If a new channel is allocated during the playback, make sure
 		// its volume is correctly initialized.
-		setChannelVolume(channel);
+		if (_channel[channel])
+			setChannelVolume(channel);
 	}
 
 	if (_channel[channel])


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