From 1dbd60254ce4c24716be9ec3b3e3f366ed573e19 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sat, 27 Feb 2010 13:05:34 +0000
Subject: [PATCH] No more crashing if an invalid Jukebox path is entered -
 default to MIDI

---
 CHANGELOG.txt      | 1 +
 arch/sdl/jukebox.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1e9b12993..9864b2d11 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100227
 --------
 main/menu.c: Actually change to MIDI if Jukebox was selected
+arch/sdl/jukebox.c: No more crashing if an invalid Jukebox path is entered - default to MIDI
 
 20100226
 --------
diff --git a/arch/sdl/jukebox.c b/arch/sdl/jukebox.c
index d4db9ec5f..6b15b309e 100644
--- a/arch/sdl/jukebox.c
+++ b/arch/sdl/jukebox.c
@@ -96,6 +96,8 @@ int jukebox_play_tracks(int first, int last, void (*hook_finished)(void)) {
 		jukebox_play_last = last - 1;
 
 	music_filename = JukeboxSongs[jukebox_playing];
+	if (!music_filename)
+		return 0;
 
 	jukebox_hook_finished = hook_finished ? hook_finished : mix_free_music;
 	mix_play_file(music_filename, 0, jukebox_hook_next);	// have our function handle looping