projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Norwegian Translation
[supertux.git]
/
lib
/
audio
/
sound_manager.cpp
diff --git
a/lib/audio/sound_manager.cpp
b/lib/audio/sound_manager.cpp
index
283fbba
..
0243f24
100644
(file)
--- 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()
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();
if(audio_device)
Mix_HaltMusic();
-sounds.clear();
-destroy_instance();
+ sounds.clear();
}
void
}
void
@@
-184,7
+184,8
@@
SoundManager::enable_music(bool enable)
if(m_music_enabled == false) {
Mix_HaltMusic();
} else {
if(m_music_enabled == false) {
Mix_HaltMusic();
} else {
- Mix_PlayMusic(current_music->music, -1);
+ if(current_music)
+ Mix_PlayMusic(current_music->music, -1);
}
}
}
}