From 8cf83e3435ca6a63b65c0eee627805be517b2c86 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 19 Jul 2005 21:48:59 +0000
Subject: Fixed crash when quitting.

svn-id: r18568
---
 saga/music.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/saga/music.cpp b/saga/music.cpp
index 84cb4c9ea7..f536663e4d 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -293,6 +293,7 @@ Music::Music(SagaEngine *vm, Audio::Mixer *mixer, MidiDriver *driver, int enable
 }
 
 Music::~Music() {
+	_mixer->stopHandle(_musicHandle);
 	delete _player;
 	xmidiParser->setMidiDriver(NULL);
 	smfParser->setMidiDriver(NULL);
@@ -318,7 +319,7 @@ void Music::musicVolumeGauge() {
 	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 @@ void Music::setVolume(int volume, int time) {
 		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 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 		} else {
 			context = _vm->_resource->getContext(GAME_MUSICFILE_GM);
 		}
-
 	}
 
 	_player->setGM(true);
-- 
cgit v1.2.3