From c68f14e55fdf96bd5420c19a4a071f1c0472641e Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Tue, 19 Dec 2006 19:41:24 +0000 Subject: [PATCH] Set error when trying to load MIDI with rwops --- music.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/music.c b/music.c index f1c4ee83..783f7a62 100644 --- a/music.c +++ b/music.c @@ -1412,21 +1412,25 @@ Mix_Music *Mix_LoadMUS_RW(SDL_RWops *rw) { /* MIDI files have the magic four bytes "MThd" */ if ( strcmp((char *)magic, "MThd") == 0 ) { music->type = MUS_MID; - music->error = 1; #ifdef USE_NATIVE_MIDI if ( native_midi_ok ) { music->data.nativemidi = native_midi_loadsong_RW(rw); - if ( music->data.nativemidi ) { - music->error = 0; + if ( music->data.nativemidi == NULL ) { + Mix_SetError("%s", native_midi_error()); + music->error = 1; } } MIDI_ELSE #endif #ifdef USE_TIMIDITY_MIDI if ( timidity_ok ) { music->data.midi = Timidity_LoadSong_RW(rw); - if ( music->data.midi ) { - music->error = 0; + if ( music->data.midi == NULL ) { + Mix_SetError("%s", Timidity_Error()); + music->error = 1; } + } else { + Mix_SetError("%s", Timidity_Error()); + music->error = 1; } #endif } else