summaryrefslogtreecommitdiff
path: root/src/sound.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-23 23:47:32 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-09-23 23:47:32 +0000
commit7ca971f04907031b80ffbcb159e5af2f595e3af8 (patch)
treec7f0f210325acb35f63071797407d266ba7e9e35 /src/sound.cpp
parentc3d7827d18b725d2dff94e08a17474d607bb43dd (diff)
downloadmana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.gz
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.bz2
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.tar.xz
mana-7ca971f04907031b80ffbcb159e5af2f595e3af8.zip
Merged most of the changes in biggeruniverse's second memory cleanup patch.
Diffstat (limited to 'src/sound.cpp')
-rw-r--r--src/sound.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index d562a688..7bbe36e7 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -38,8 +38,6 @@ Sound::Sound():
Sound::~Sound()
{
- stopMusic();
- close();
}
void Sound::init()
@@ -207,6 +205,8 @@ void Sound::playSfx(const char *path)
void Sound::close()
{
+ stopMusic();
+
installed = false;
Mix_CloseAudio();
logger->log("Sound::close() Shutting down sound...");