From 057523af2ccbb9effe04aac17d77bae016b6fc7a Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Sun, 1 Jun 2008 22:33:21 +0000
Subject: [PATCH] Only stop music at jukebox_stop() if MIDI jukebox_loaded -
 otherwise user can stop Jukebox with keys but not start it again

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 775c184a7..bb9eb0112 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,13 @@
 D2X-Rebirth Changelog
 
+20080602
+--------
+arch/sdl/jukebox.c: Only stop music at jukebox_stop() if MIDI jukebox_loaded - otherwise user can stop Jukebox with keys but not start it again
+
+20080601
+--------
+include/args.h, main/inferno.c, main/hud.c, main/game.c, main/gamecntl.c, misc/args.c, d2x.ini, README.txt, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/digi_audio.c, arch/win32/include/hmpfile.h, arch/win32/hmpfile.c: Using Windows code to play HMP files on Windows build; Fixed Jukebox keys in help screen; Allow -noredundancy in Singleplayer; Fixed processing of Console keys if Console is not active; Added Multiplayer hints to README; Made INI wrapping safer and more accurate
+
 20080528
 --------
 arch/sdl/rbaudio.c, main/songs.c: allow an audio CD to be played if it's inserted after D2X is launched, hopefully find the first audio CD if multiple CDs are inserted
diff --git a/arch/sdl/jukebox.c b/arch/sdl/jukebox.c
index bc60e094d..2aae54023 100644
--- a/arch/sdl/jukebox.c
+++ b/arch/sdl/jukebox.c
@@ -141,7 +141,7 @@ void jukebox_play(int loop) {
 }
 
 void jukebox_stop() {
-	//if (!jukebox_loaded) return;	// since this function is also used for stopping MIDI
+	if (!jukebox_loaded) return;	// since this function is also used for stopping MIDI
 	mix_stop_music();
 	if (jukebox_playing)
 		hud_message(MSGC_GAME_FEEDBACK, JUKEBOX_HUDMSG_STOPPED);