From 88478990b97c9c8d86a5a5edb8e293863266b640 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 26 Apr 2013 14:15:11 +0200 Subject: [PATCH] * Fix a problem with CleanUp function trying to clean up music cache twice --- src/sound/oalsound/alsound.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp index 50564e93..cfb0c709 100644 --- a/src/sound/oalsound/alsound.cpp +++ b/src/sound/oalsound/alsound.cpp @@ -43,11 +43,16 @@ void ALSound::CleanUp() if (mEnabled) { GetLogger()->Info("Unloading files and closing device...\n"); StopAll(); + StopMusic(); for (auto channel : mChannels) { delete channel.second; } + if (mCurrentMusic) { + delete mCurrentMusic; + } + for (auto item : mSounds) { delete item.second; } @@ -58,8 +63,6 @@ void ALSound::CleanUp() mEnabled = false; - mCurrentMusic->FreeBuffer(); - delete mCurrentMusic; alcDestroyContext(mContext); alcCloseDevice(mDevice); }