diff options
| author | David Robillard <d@drobilla.net> | 2014-12-28 15:14:47 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-12-28 16:06:44 -0500 |
| commit | ec947ff8fd2cf229284f757b8bd6b0f96cbd6383 (patch) | |
| tree | 4e75e57f37e3b3539abb12908e6fc50e078c7e6e /libs/ardour/midi_source.cc | |
| parent | dbc2f59453af4d22532360393c0fa858d257f5a6 (diff) | |
Fix occasional MIDI read crash.
Locking should prevent this from being a problem, but taking a reference to the
cached iterator and mutating it directly causes occasional crashes for me for
reasons I can't quite figure out.
This fixes the issue and is arguably more sane anyway, so whatever.
Diffstat (limited to 'libs/ardour/midi_source.cc')
| -rw-r--r-- | libs/ardour/midi_source.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 1b1cf20c68..c63a262a53 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -200,11 +200,10 @@ MidiSource::midi_read (const Lock& lm, if (_model) { // Find appropriate model iterator - Evoral::Sequence<Evoral::MusicalTime>::const_iterator& i = _model_iter; + Evoral::Sequence<Evoral::MusicalTime>::const_iterator i = _model_iter; if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) { // Cached iterator is invalid, search for the first event past start - i = _model->begin(converter.from(start), false, filtered); - _model_iter_valid = true; + i = _model->begin(converter.from(start), false, filtered); } _last_read_end = start + cnt; @@ -230,6 +229,8 @@ MidiSource::midi_read (const Lock& lm, break; } } + _model_iter = i; + _model_iter_valid = true; return cnt; } else { return read_unlocked (lm, dst, source_start, start, cnt, tracker); |