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

[thebluegr at users.sourceforge.net]

Revision: 28347
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28347&view=rev
Author:   thebluegr
Date:     2007-07-30 17:52:00 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Music should not be played after changing scene if it's disabled from the options

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

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-07-31 00:18:45 UTC (rev 28346)
+++ scummvm/trunk/engines/saga/music.cpp	2007-07-31 00:52:00 UTC (rev 28347)
@@ -431,6 +431,10 @@
 	_player->stopMusic();
 	_mixer->stopHandle(_musicHandle);
 
+	if (!_vm->_musicVolume) {
+		return;
+	}
+
 	int realTrackNumber;
 
 	if (_vm->getGameType() == GType_ITE) {


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