libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 21:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash when quitting.

Browse Source 
svn-id: r18568
This commit is contained in:
Torbjörn Andersson 2005-07-19 21:48:59 +00:00
parent d58e018004
commit 8cf83e3435
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
saga/music.cpp
View File

@ -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);