diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-04-22 12:38:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 12:38:01 +0300 |
| commit | c8a9c7490e4f056ee572489b0ab73cef2a96b04f (patch) | |
| tree | 60bae22e52825784e8b1898053c34170d7215db5 /src/adlmidi_midiplay.cpp | |
| parent | 27cafc55baac5c73dd132ad8f74b92b0ceb2161b (diff) | |
| parent | 369efe536ef43127efad27021bcb747e6bbc2449 (diff) | |
| download | libADLMIDI-c8a9c7490e4f056ee572489b0ab73cef2a96b04f.tar.gz libADLMIDI-c8a9c7490e4f056ee572489b0ab73cef2a96b04f.tar.bz2 libADLMIDI-c8a9c7490e4f056ee572489b0ab73cef2a96b04f.zip | |
Merge pull request #79 from jpcima/hard-rt-nullfix
check LocationData for null on access of vibdelay
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 702ebea..88c1b39 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -1618,7 +1618,7 @@ void MIDIplay::NoteUpdate(uint16_t MidCh, phase = ains.voice2_fine_tune;//0.125; // Detune the note slightly (this is what Doom does) } - if(Ch[MidCh].vibrato && d->vibdelay >= Ch[MidCh].vibdelay) + if(Ch[MidCh].vibrato && (!d || d->vibdelay >= Ch[MidCh].vibdelay)) bend += Ch[MidCh].vibrato * Ch[MidCh].vibdepth * std::sin(Ch[MidCh].vibpos); #ifdef ADLMIDI_USE_DOSBOX_OPL |