From 90a38a2b3194f2e9faa430e69faf2afc1dcc00e6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 May 2022 11:49:43 -0600 Subject: [PATCH] fix tempo marker drag crash caused by use of uninitialized map member --- gtk2_ardour/editor_drag.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 9d47b4b15a..87ffaab283 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3537,7 +3537,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) _marker = reinterpret_cast (_item->get_data ("marker")); _real_section = &_marker->tempo(); - _movable = !map->is_initial (_marker->tempo()); + _movable = !TempoMap::use()->is_initial (_marker->tempo()); _grab_bpm = Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), _real_section->end_note_types_per_minute()); _grab_qn = _real_section->beats(); assert (_marker); @@ -3554,7 +3554,7 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) /* setup thread-local tempo map ptr as a writable copy */ - _editor->begin_tempo_map_edit (); + map = _editor->begin_tempo_map_edit (); } }