From 260a0ca12c00f1d74c6445f81a7e94c58ec56c70 Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Fri, 10 Jun 2016 01:14:08 +1000
Subject: [PATCH] Amend last commit.

---
 libs/ardour/tempo.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) {