X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Faudio%2Fsound_manager.cpp;h=0243f241c7dc7e9a936dc423ac8919c57a231f86;hb=133d94d5b145f325c38c8c15c9ea561bfffb092d;hp=283fbba2ca1c30446390e7fb2a9a93bcf5e537d1;hpb=e4d4375bf4b6802321d956f5f3886320b7275cf0;p=supertux.git

diff --git a/lib/audio/sound_manager.cpp b/lib/audio/sound_manager.cpp
index 283fbba2c..0243f241c 100644
--- a/lib/audio/sound_manager.cpp
+++ b/lib/audio/sound_manager.cpp
@@ -33,7 +33,8 @@ using namespace SuperTux;
 SoundManager* SoundManager::instance_ = 0;
 
 SoundManager::SoundManager()
-  : current_music(0), m_music_enabled(true) , m_sound_enabled(true) , audio_device(true)
+  : current_music(0), m_music_enabled(true) , m_sound_enabled(true),
+    audio_device(true)
 {
 }
 
@@ -42,8 +43,7 @@ SoundManager::~SoundManager()
   if(audio_device)
     Mix_HaltMusic();
 
-sounds.clear();
-destroy_instance();
+  sounds.clear();
 }
 
 void
@@ -184,7 +184,8 @@ SoundManager::enable_music(bool enable)
   if(m_music_enabled == false) {
     Mix_HaltMusic();
   } else {
-    Mix_PlayMusic(current_music->music, -1);
+    if(current_music)
+      Mix_PlayMusic(current_music->music, -1);
   }
 }