From 1401c6e45a449a7ca0845762bafb953505db3bd4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 9 Jan 2026 20:06:41 -0700 Subject: [PATCH] temporal: handle a special condition where the got added in 6bc2261575 should not be used --- libs/temporal/tempo.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index 52fec640bf..7065b43f46 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -3155,6 +3155,7 @@ TempoMap::fill_grid_by_walking (TempoMapPoints& ret, Points::const_iterator& p_i find_next_point: bool reset = false; + bool can_goto = true; if (!mtp) { if (bbt == p->bbt()) { @@ -3180,6 +3181,7 @@ TempoMap::fill_grid_by_walking (TempoMapPoints& ret, Points::const_iterator& p_i reset = true; } else { DEBUG_TRACE (DEBUG::Grid, string_compose ("confirmed that BBT %1 has audio time %2 before next point %3\n", bbt, start, *p)); + can_goto = false; } } @@ -3314,7 +3316,7 @@ TempoMap::fill_grid_by_walking (TempoMapPoints& ret, Points::const_iterator& p_i } - if (p != _points.end() && p->bbt() < bbt) { + if (can_goto && (p != _points.end()) && (p->bbt() < bbt)) { /* We reached a point that didn't coincide with the one we were looking at, but we have not yet reached the BBT value for the next grid point. Go back and run the