From e7ced9b855f641637c87cf1851cad7fe8a9cff53 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Oct 2023 13:23:52 -0600 Subject: [PATCH] mergeable line: check callbacks are non-null before calling them --- gtk2_ardour/mergeable_line.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/mergeable_line.cc b/gtk2_ardour/mergeable_line.cc index de29da4d8a..d554b05133 100644 --- a/gtk2_ardour/mergeable_line.cc +++ b/gtk2_ardour/mergeable_line.cc @@ -91,11 +91,11 @@ MergeableLine::merge_drawn_line (Editor& e, Session& s, Evoral::ControlList::Ord } list->thaw (); - if (_control && _control->automation_state () == ARDOUR::Off) { + if (automation_state_callback && _control && _control->automation_state () == ARDOUR::Off) { automation_state_callback (ARDOUR::Play); } - if (UIConfiguration::instance().get_automation_edit_cancels_auto_hide () && _control == s.recently_touched_controllable ()) { + if (control_touched_callback && UIConfiguration::instance().get_automation_edit_cancels_auto_hide () && _control == s.recently_touched_controllable ()) { control_touched_callback (); }