ardour/livetrax
13
0
Fork 0
Code

Fix assertion failure when merging a set of nascent events which start at the same time as the last event in a ControlList.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9384 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-04-20 01:24:10 +00:00
parent 5ebdcdf12e
commit 51e368f3f0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/evoral/src/ControlList.cpp
View File

@ -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.
*/
@ -331,8 +331,14 @@ 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 */