diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index b0c77fbd..4ce46b34 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -1026,14 +1026,22 @@ void musicclass::pause(void) } void musicclass::haltdasmusik(void) +{ + haltdasmusik(false); +} + +void musicclass::haltdasmusik(const bool from_fade) { /* Just pauses music. This is intended. */ pause(); currentsong = -1; m_doFadeInVol = false; m_doFadeOutVol = false; - nicefade = false; - nicechange = -1; + if (!from_fade) + { + nicefade = false; + nicechange = -1; + } } void musicclass::silencedasmusik(void) @@ -1145,7 +1153,7 @@ void musicclass::processmusicfadeout(void) { musicVolume = 0; m_doFadeOutVol = false; - haltdasmusik(); + haltdasmusik(true); } } diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h index dd9a9112..8c6b3ee0 100644 --- a/desktop_version/src/Music.h +++ b/desktop_version/src/Music.h @@ -23,6 +23,7 @@ public: void resumefade(const int fadein_ms); void pause(void); void haltdasmusik(void); + void haltdasmusik(bool from_fade); void silencedasmusik(void); void fadeMusicVolumeIn(int ms); void fadeMusicVolumeOut(const int fadeout_ms);