[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.59,1.60

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Jul 19 14:54:23 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31521

Modified Files:
	music.cpp 
Log Message:
Fixed crash when quitting.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- music.cpp	19 Jul 2005 21:34:46 -0000	1.59
+++ music.cpp	19 Jul 2005 21:48:59 -0000	1.60
@@ -293,6 +293,7 @@
 }
 
 Music::~Music() {
+	_mixer->stopHandle(_musicHandle);
 	delete _player;
 	xmidiParser->setMidiDriver(NULL);
 	smfParser->setMidiDriver(NULL);
@@ -318,7 +319,7 @@
 	if (volume < 0)
 		volume = 1;
 
-	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
 	_player->setVolume(volume);
 
 	if (_currentVolumePercent == 100) {
@@ -335,7 +336,7 @@
 		volume = ConfMan.getInt("music_volume");
 
 	if (time == 1) {
-		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
+		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
 		Common::g_timer->removeTimerProc(&musicVolumeGaugeCallback);
 		_currentVolume = volume;
 		return;
@@ -429,7 +430,6 @@
 		} else {
 			context = _vm->_resource->getContext(GAME_MUSICFILE_GM);
 		}
-
 	}
 
 	_player->setGM(true);





More information about the Scummvm-git-logs mailing list