allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix occasional MIDI read crash.

Browse Source 
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.
This commit is contained in:
David Robillard
2014-12-28 15:14:47 -05:00
parent dbc2f59453
commit ec947ff8fd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/midi_source.cc
View File

@@ -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);