From e4d6e4a87f5f93c9cc34d1d1f8909be4c90ce0ea Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Mon, 12 Dec 2016 02:37:26 +1100
Subject: [PATCH] disallow placement of audio-locked tempi within a frame of
 any other.

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

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index f901607338..30b10ad8bf 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2567,6 +2567,11 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
 					}
 					continue;
 				}
+
+				if (t->frame() == frame_at_minute (minute)) {
+					return false;
+				}
+
 				if (t->position_lock_style() == MusicTime) {
 					prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse()));
 					t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse()));