mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-08 15:54:57 +01:00
Fix assertion failure when merging a set of nascent events which start at the same time as the last event in a ControlList.
git-svn-id: svn://localhost/ardour2/branches/3.0@9384 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
5ebdcdf12e
commit
51e368f3f0
1 changed files with 9 additions and 3 deletions
|
|
@ -282,7 +282,7 @@ ControlList::merge_nascent (double when)
|
|||
|
||||
} else {
|
||||
|
||||
/* find the range that overaps with nascent events,
|
||||
/* find the range that overlaps with nascent events,
|
||||
and insert the contents of nascent events.
|
||||
*/
|
||||
|
||||
|
|
@ -332,7 +332,13 @@ ControlList::merge_nascent (double when)
|
|||
}
|
||||
}
|
||||
|
||||
assert (range_begin != _events.end());
|
||||
/* Now:
|
||||
range_begin is the first event on our list after the first nascent event
|
||||
range_end is the first event on our list after the last nascent event
|
||||
|
||||
range_begin may be equal to _events.end() iff the last event on our list
|
||||
was at the same time as the first nascent event.
|
||||
*/
|
||||
|
||||
if (range_begin != _events.begin()) {
|
||||
/* clamp point before */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue