From 10b845b1caae65a5c11a8bbaf03eb7446cacfba6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 11 Mar 2023 20:50:05 -0700 Subject: [PATCH] fix mapping begin/commit/abort logic in editor --- gtk2_ardour/editor_tempodisplay.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 9fd037c17c..d4e182a0ad 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -769,6 +769,7 @@ Editor::abort_tempo_mapping () delete domain_swap; /* undo the domain swap */ domain_swap = 0; + TempoMap::abort_update (); TempoMap::SharedPtr tmap (TempoMap::fetch()); reassociate_metric_markers (tmap); } @@ -777,7 +778,10 @@ void Editor::commit_tempo_mapping (TempoMap::WritableSharedPtr& new_map) { TempoMap::update (new_map); - abort_tempo_mapping (); + delete domain_swap; /* undo the domain swap */ + domain_swap = 0; + TempoMap::SharedPtr tmap (TempoMap::fetch()); + reassociate_metric_markers (tmap); } Temporal::TempoMap::WritableSharedPtr