smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 01:56:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash on iteration over an empty sequence and/or recording controllers only.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4596 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-16 04:46:06 +00:00
parent 93d7040d04
commit 0ef53a2d34
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/evoral/src/Sequence.cpp
View file

@ -186,10 +186,10 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
seq.control_to_midi_event(_event, earliest_control); seq.control_to_midi_event(_event, earliest_control);
break; break;
default: default:
assert(false); break;
} }
if (!_event || _event->size() == 0) { if (_type == NIL || !_event || _event->size() == 0) {
DUMP(format("Starting at end @ %1%\n") % t); DUMP(format("Starting at end @ %1%\n") % t);
_type = NIL; _type = NIL;
_is_end = true; _is_end = true;
@ -200,10 +200,8 @@ Sequence<Time>::const_iterator::const_iterator(const Sequence<Time>& seq, Time t
% (int)_event->event_type() % (int)_event->event_type()
% (int)((MIDIEvent<Time>*)_event.get())->type() % (int)((MIDIEvent<Time>*)_event.get())->type()
% _event->time()); % _event->time());
}
assert(_event && _event->size() > 0 && _event->time() >= t);
assert(midi_event_is_valid(_event->buffer(), _event->size())); assert(midi_event_is_valid(_event->buffer(), _event->size()));
}
} }
template<typename Time> template<typename Time>