From 657743a8e4cd155f95f74ef02c6d4382f7657a06 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Aug 2021 12:58:40 -0600 Subject: [PATCH] libardour: Region::get_cue_markers() should only return markers within the region boundaries, whether abs(olute) position is requested or not --- libs/ardour/region.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index bda7821163..59b470f55e 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1921,10 +1921,12 @@ Region::get_cue_markers (CueMarkers& cues, bool abs) const for (SourceList::const_iterator s = _sources.begin (); s != _sources.end(); ++s) { CueMarkers const& x = (*s)->cue_markers (); for (CueMarkers::const_iterator p = x.begin (); p != x.end (); ++p) { - if (abs) { - cues.insert (*p); - } else if (p->position() >= _start && p->position() < _start + _length) { - cues.insert (CueMarker (p->text(), p->position() - _start)); + if (p->position() >= _start && p->position() < _start + _length) { + if (abs) { + cues.insert (*p); + } else { + cues.insert (CueMarker (p->text(), p->position() - _start)); + } } } }