summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-06-10 01:14:08 +1000
committernick_m <mainsbridge@gmail.com>2016-06-10 01:14:08 +1000
commit260a0ca12c00f1d74c6445f81a7e94c58ec56c70 (patch)
tree3c200c041d26ff2ea0cd69f55d04f3e7328babee /libs
parente05b0862b5345f35d8ab88e8952e2e6fb013aa0a (diff)
Amend last commit.
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/tempo.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 7dc3350141..5e6f5ad3aa 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2027,7 +2027,9 @@ TempoMap::solve_map_frame (Metrics& imaginary, TempoSection* section, const fram
if (prev_t) {
if (t == section) {
section_prev = prev_t;
- prev_t = t;
+ if (t->locked_to_meter()) {
+ prev_t = t;
+ }
continue;
}
if (t->position_lock_style() == MusicTime) {