From 1035f9bd6213658a724c4d31eacbe4e07f654a19 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 7 Feb 2021 23:15:30 -0700 Subject: [PATCH] libtemporal: fix crash caused by thinko --- libs/temporal/tempo.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index ffa814df8e..1b196a023f 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -1086,13 +1086,13 @@ TempoMap::reset_starting_at (superclock_t sc) TempoMetric metric (*current_tempo, *current_meter); - if (m->sclock() == first_of_three->sclock()) { + if (m != _meters.end() && m->sclock() == first_of_three->sclock()) { advance_meter = true; current_meter = &*m; DEBUG_TRACE (DEBUG::TemporalMap, string_compose ("\tcurrent point defines meter %1\n", *current_meter)); } - if (t->sclock() == first_of_three->sclock()) { + if (t != _tempos.end() && t->sclock() == first_of_three->sclock()) { advance_tempo = true; current_tempo = &*t; DEBUG_TRACE (DEBUG::TemporalMap, string_compose ("\tcurrent point defines tempo %1\n", *current_tempo));