From 39e7e11b5e605475199493a0f38bc3f4c986caa8 Mon Sep 17 00:00:00 2001 From: nick_m Date: Tue, 23 May 2017 11:41:36 +1000 Subject: Sort tempo map after legacy sections have been assigned a pulse --- libs/ardour/tempo.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 6b1142c1e8..240be1b9e1 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -4640,11 +4640,6 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) } } - if (niter == nlist.end()) { - MetricSectionSorter cmp; - _metrics.sort (cmp); - } - /* check for legacy sessions where bbt was the base musical unit for tempo */ for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { TempoSection* t; @@ -4663,6 +4658,11 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) } } + if (niter == nlist.end()) { + MetricSectionSorter cmp; + _metrics.sort (cmp); + } + /* check for multiple tempo/meters at the same location, which ardour2 somehow allowed. */ -- cgit v1.2.3