Ticket #8927: agi_midi_crash.diff

sound.cpp

@@ -454 +454 @@
                 _waveform = waveformMac;
                 break;
         case SOUND_EMU_APPLE2GS:
-                loadInstruments();
+                _disabledMidi = !loadInstruments();
                 break;
         }
 
@@ -514 +514 @@
 }
 
 void SoundMgr::playMidiSound() {
+        if (_disabledMidi)
+                return;
+
         const uint8 *p;
         uint8 parm1, parm2;
         static uint8 cmd, ch;
@@ -1218 +1221 @@
         _playing = false;
         _sndBuffer = (int16 *)calloc(2, BUFFER_SIZE);
         _waveform = 0;
+        _disabledMidi = false;
 }
 
 void SoundMgr::premixerCall(int16 *data, uint len) {

sound.h

@@ -467 +467 @@
         int _endflag;
         int _playingSound;
         uint8 _env;
+        bool _disabledMidi;
 
         int16 *_sndBuffer;
         const int16 *_waveform;