immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a problem with CleanUp function trying to clean up music cache twice

dev-ui
erihel 2013-04-26 14:15:11 +02:00
parent eb37da86ce
commit 88478990b9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sound/oalsound/alsound.cpp
View File

@ -43,11 +43,16 @@ void ALSound::CleanUp()
if (mEnabled) { if (mEnabled) {
GetLogger()->Info("Unloading files and closing device...\n"); GetLogger()->Info("Unloading files and closing device...\n");
StopAll(); StopAll();
StopMusic();
for (auto channel : mChannels) { for (auto channel : mChannels) {
delete channel.second; delete channel.second;
} }
if (mCurrentMusic) {
delete mCurrentMusic;
}
for (auto item : mSounds) { for (auto item : mSounds) {
delete item.second; delete item.second;
} }
@ -58,8 +63,6 @@ void ALSound::CleanUp()
mEnabled = false; mEnabled = false;
mCurrentMusic->FreeBuffer();
delete mCurrentMusic;
alcDestroyContext(mContext); alcDestroyContext(mContext);
alcCloseDevice(mDevice); alcCloseDevice(mDevice);
} }