From 01000ab6c9af2ca8fa1a71f7163fcdfe0e0fdd7b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 24 Aug 2025 16:28:56 -0600 Subject: [PATCH] do not short-circuit CueEditor::set_region() if used with the current region This stops us from failing to calling unset(), which was resulting in a pianoroll being over-connected to a region's property change signal. Also, EC_LOCAL_TEMPO_SCOPE is inappropriate in a method that will call set_local_tempo_map() --- gtk2_ardour/cue_editor.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gtk2_ardour/cue_editor.cc b/gtk2_ardour/cue_editor.cc index 15deff6a3e..2da8f0d1d4 100644 --- a/gtk2_ardour/cue_editor.cc +++ b/gtk2_ardour/cue_editor.cc @@ -1199,12 +1199,6 @@ CueEditor::set_track (std::shared_ptr t) void CueEditor::set_region (std::shared_ptr r) { - EC_LOCAL_TEMPO_SCOPE; - - if (r == _region) { - return; - } - unset (false); _region = r; @@ -1456,8 +1450,6 @@ CueEditor::idle_data_captured () void CueEditor::unset (bool trigger_too) { - EC_LOCAL_TEMPO_SCOPE; - if (_local_tempo_map) { end_local_tempo_map (); } @@ -1465,6 +1457,7 @@ CueEditor::unset (bool trigger_too) history_connection.disconnect(); _update_connection.disconnect(); object_connections.drop_connections (); + std::cerr << "CE:unset, oc now " << object_connections.size() << std::endl; rec_blink_connection.disconnect (); count_in_connection.disconnect (); capture_connections.drop_connections ();