From 303c3d91b10505e7f00aeb1d17837648d6ef1f23 Mon Sep 17 00:00:00 2001 From: kreatordxx <> Date: Sat, 27 Feb 2010 12:50:30 +0000 Subject: [PATCH] Actually change to MIDI if Jukebox was selected --- CHANGELOG.txt | 4 ++++ main/menu.c | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b3dd92a0a..1e9b12993 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20100227 +-------- +main/menu.c: Actually change to MIDI if Jukebox was selected + 20100226 -------- main/menu.c, main/newmenu.c: Handle all user input in callback for sounds menu, being more judicious about when to restart the music. Also make the jukebox path input a NM_TYPE_INPUT_MENU, allowing the user to abort changes diff --git a/main/menu.c b/main/menu.c index 5c7494353..c68958260 100644 --- a/main/menu.c +++ b/main/menu.c @@ -1105,15 +1105,13 @@ int sound_menuset(newmenu *menu, d_event *event, void *userdata) case 3: case 4: +#ifdef USE_SDLMIXER + case 5: + GameCfg.JukeboxOn = items[5].value; +#endif GameCfg.SndEnableRedbook = items[4].value; replay = 1; break; -#ifdef USE_SDLMIXER - case 5: - GameCfg.JukeboxOn = items[citem].value; - replay = 1; - break; -#endif default: if (citem == nitems - 1)