X-Git-Url: https://git.octo.it/?p=supertux.git;a=blobdiff_plain;f=src%2Faudio%2Fsound_manager.cpp;h=3740d71fec63fcf883128788af871d047faac8bf;hp=ace96c1290d18acc3e92e28fe4a261edac86d38a;hb=9f40a73e89c17a2862a1213343589c19eff42199;hpb=1240eda3ac57e6607b206e3c9cf7feb65c3be620 diff --git a/src/audio/sound_manager.cpp b/src/audio/sound_manager.cpp index ace96c129..3740d71fe 100644 --- a/src/audio/sound_manager.cpp +++ b/src/audio/sound_manager.cpp @@ -303,6 +303,9 @@ SoundManager::play_music(const std::string& filename, bool fade) void SoundManager::pause_music(float fadetime) { + if(music_source == NULL || !music_source->playing()) + return; + if(fadetime > 0) { if(music_source && music_source->get_fade_state() != StreamSoundSource::FadingPause) @@ -315,6 +318,9 @@ SoundManager::pause_music(float fadetime) void SoundManager::resume_music(float fadetime) { + if(music_source == NULL || !music_source->paused()) + return; + if(fadetime > 0) { if(music_source && music_source->get_fade_state() != StreamSoundSource::FadingResume)