fix yet another meter-locked tempo ordering thinko.

[ardour.git] / libs / ardour / tempo.cc

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 4e6a853ec553cf896504581474ede1c1974f8032..ab7f459d1e9484415468ca7ca182c8a4ce548ed1 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2658,13 +2658,11 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
                                if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) {
                                        section_prev = prev_t;
 
-                                       if (t->locked_to_meter()) {
-                                               section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
-                                               if (!section->locked_to_meter()) {
-                                                       section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
-                                               }
-                                               prev_t = section;
+                                       section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
+                                       if (!section->locked_to_meter()) {
+                                               section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
                                        }
+                                       prev_t = section;
                                }
 
                                if (t->position_lock_style() == MusicTime) {
@@ -2681,13 +2679,6 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou
                }
        }
 
-       if (section_prev) {
-               section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute));
-               if (!section->locked_to_meter()) {
-                       section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute));
-               }
-       }
-
 #if (0)
        recompute_tempi (imaginary);