From: nick_m <mainsbridge@gmail.com>
Date: Thu, 7 Jul 2016 12:37:28 +0000 (+1000)
Subject: Always set the musical position in Region::recompute_position_from_lock_style().
X-Git-Tag: 5.0-pre1~215
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=703150d365a98e5e4dadcbf2d2fa585f3bae8cd8;p=ardour.git

Always set the musical position in Region::recompute_position_from_lock_style().
---

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index d308ea7797..e9b3f59bda 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -672,9 +672,7 @@ Region::set_position_internal (framepos_t pos, bool allow_bbt_recompute, const i
 void
 Region::recompute_position_from_lock_style (const int32_t& sub_num)
 {
-	if (_position_lock_style == MusicTime) {
-		_beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num);
-	}
+	_beat = _session.tempo_map().exact_beat_at_frame (_position, sub_num);
 }
 
 void