Merge branch 'fix-music-toggle' into 'master'

TuneManager: clear current song if music is disabled, so music can resume later

Closes #797

See merge request KartKrew/Kart!1709

src/music.cpp

@@ -183,6 +183,11 @@ void Music_Tick(void)
 	g_tunes.tick();
 }
 
+void Music_Flip(void)
+{
+	g_tunes.flip();
+}
+
 void Music_Play(const char* id)
 {
 	Tune* tune = g_tunes.find(id);

src/music.h

@@ -144,6 +144,11 @@ void Music_Init(void);
 // Call this every tic to update the music.
 void Music_Tick(void);
 
+// Flips the internal state so music is reloaded next tick.
+// This is required when disabling music during runtime so
+// the music plays again when re-enabled.
+void Music_Flip(void);
+
 
 #ifdef __cplusplus
 } // extern "C"

src/music_manager.hpp

@@ -53,6 +53,8 @@ public:
 		return res.first->second;
 	}
 
+	void flip() { current_song_ = {}; }
+
 	void tick();
 	void pause_unpause() const;
 

src/s_sound.c

@@ -2515,6 +2515,7 @@ void GameDigiMusic_OnChange(void)
 	{
 		digital_disabled = true;
 		I_UnloadSong();
+		Music_Flip();
 	}
 }