# HG changeset patch
# User Masonwheeler <masonwheeler@yahoo.com>
# Date 1304134225 25200
# Node ID 828e3ea85e8f0dab00865a89e9c298a836b20f26
# Parent  baf2c9d52790f74d7dd8261317d0a41afd0964fa
Second bugfix for phase 1 of music integration.

diff -r baf2c9d52790 -r 828e3ea85e8f mixer.c
--- a/mixer.c	Fri Apr 29 20:30:05 2011 -0700
+++ b/mixer.c	Fri Apr 29 20:30:25 2011 -0700
@@ -274,9 +274,9 @@
 				Mix_FreeChunk(mix_channel[which].sound->chunk);
 				free(mix_channel[which].sound);
 				mix_channel[which].sound = NULL;
-				mix_channel[which].music = music;
 				mix_channel[which].is_music = SDL_TRUE;
 			}
+			mix_channel[which].music = music;
 			mix_channel[which].playing = 1;
 			mix_channel[which].looping = -1;
 			mix_channel[which].paused = 0;
diff -r baf2c9d52790 -r 828e3ea85e8f music.c
--- a/music.c	Fri Apr 29 20:30:05 2011 -0700
+++ b/music.c	Fri Apr 29 20:30:25 2011 -0700
@@ -600,6 +600,7 @@
 				music_internal_halt(music);
 			}
 		}
+		_ClearMusic(music);
 		SDL_UnlockAudio();
 		switch (music->type) {
 #ifdef CMD_MUSIC
@@ -660,7 +661,6 @@
 				/* Unknown music type?? */
 				break;
 		}
-		_ClearMusic(music);
 		free(music);
 	}
 }