summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/tempo.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index bab4abd67f..4de4dcfa1f 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1462,7 +1462,7 @@ TempoMap::recompute_meters (Metrics& metrics)
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
- if ((t->locked_to_meter() || t->initial()) && t->frame() == meter->frame()) {
+ if (t->locked_to_meter() && t->frame() == meter->frame()) {
meter_locked_tempo = t;
break;
}
@@ -2824,7 +2824,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
- if ((t->locked_to_meter() || t->initial()) && t->frame() == section->frame()) {
+ if (t->locked_to_meter() && t->frame() == section->frame()) {
meter_locked_tempo = t;
break;
}
@@ -3000,7 +3000,7 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
- if ((t->locked_to_meter() || t->initial()) && t->frame() == m->frame()) {
+ if (t->locked_to_meter() && t->frame() == m->frame()) {
meter_locked_tempo = t;
break;
}