summaryrefslogtreecommitdiff
path: root/libs/ardour/tempo.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2017-05-23 11:41:36 +1000
committernick_m <mainsbridge@gmail.com>2017-05-23 11:41:36 +1000
commit39e7e11b5e605475199493a0f38bc3f4c986caa8 (patch)
tree18069da296aaf3521741a1d8fba1869c9cbc27d8 /libs/ardour/tempo.cc
parentb886c1dcfa36f969086c8515da046d99fa916495 (diff)
Sort tempo map after legacy sections have been assigned a pulse
Diffstat (limited to 'libs/ardour/tempo.cc')
-rw-r--r--libs/ardour/tempo.cc10
1 files changed, 5 insertions, 5 deletions
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.
*/