# HG changeset patch
# User Masonwheeler <masonwheeler@yahoo.com>
# Date 1304131300 25200
# Node ID 30a2304aa627f9a31ab653aa094cbe158f41f870
# Parent  10ced1337f977e5950623414eab39d0a764533b7
Bugfix for phase 1 of music integration.

diff -r 10ced1337f97 -r 30a2304aa627 mixer.c
--- a/mixer.c	Fri Apr 29 18:52:56 2011 -0700
+++ b/mixer.c	Fri Apr 29 19:41:40 2011 -0700
@@ -292,6 +292,17 @@
 	SDL_UnlockAudio();
 }
 
+void _ClearMusic(Mix_Music * song)
+{
+	int i;
+	for ( i=0; i<num_channels; ++i ) {
+		if ((mix_channel[i].is_music) && (mix_channel[i].music == song)){
+			mix_channel[i].playing = 0;
+			mix_channel[i].music = NULL;
+		}
+	}
+}
+
 void *Mix_DoEffects(int chan, void *snd, int len)
 {
 	int posteffect = (chan == MIX_CHANNEL_POST);
diff -r 10ced1337f97 -r 30a2304aa627 music.c
--- a/music.c	Fri Apr 29 18:52:56 2011 -0700
+++ b/music.c	Fri Apr 29 19:41:40 2011 -0700
@@ -86,6 +86,7 @@
 extern Mix_Music* _ChannelPlayingMusic(int channel);
 extern void _HaltAllMusic(void);
 extern void _StartMusic(int channel, int is_fading, Mix_Music* music);
+extern void _ClearMusic(Mix_Music * song);
 
 struct _Mix_Music {
 	Mix_MusicType type;
@@ -659,6 +660,7 @@
 				/* Unknown music type?? */
 				break;
 		}
+		_ClearMusic(music);
 		free(music);
 	}
 }
@@ -1043,8 +1045,8 @@
 		return;
 	}
 	music_playing->fading = MIX_NO_FADING;
-	music_playing = NULL;
 }
+
 int Mix_HaltMusic(Mix_Music *music)
 {
 	if (music){