From d8cabc67d9b6d32359a353184b4604bb43abdc41 Mon Sep 17 00:00:00 2001
From: nick_m <mainsbridge@gmail.com>
Date: Sun, 11 Dec 2016 23:49:02 +1100
Subject: [PATCH] fix incorrect audio-locked tempo position when setting bbt
 via tempo dialog.

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

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 5c140e1aac..f6a4690d3a 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -3072,6 +3072,10 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt)
 
 	const double beat = beat_at_bbt_locked (future_map, bbt);
 
+	if (section->position_lock_style() == AudioTime) {
+		tempo_copy->set_position_lock_style (MusicTime);
+	}
+
 	if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) {
 		ret.first = tempo_copy->pulse();
 		ret.second = tempo_copy->frame();