From 11f278bd7977961f2f13782ba4bff3c0a88a7be1 Mon Sep 17 00:00:00 2001 From: carlh Date: Thu, 27 May 2010 12:26:00 +0000 Subject: [PATCH] Fix crash on clear option for automation tracks (#3195). Also fix state change signalling so that lines reappear on undoing a clear. git-svn-id: svn+ssh://ardour.org/ardour2/branches/3.0@7178 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/automation_time_axis.cc | 3 +-- libs/ardour/automation_list.cc | 4 ++-- libs/evoral/src/ControlList.cpp | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 51923089..9163b10d 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -385,11 +385,10 @@ AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle st void AutomationTimeAxisView::clear_clicked () { - _session->begin_reversible_command (_("clear automation")); if (_line) { + _session->begin_reversible_command (_("clear automation")); _line->clear (); } - _session->commit_reversible_command (); } void diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index b6de006d..f34104ce 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -338,7 +338,7 @@ AutomationList::deserialize_events (const XMLNode& node) maybe_signal_changed (); } - ControlList::thaw (); + thaw (); return 0; } @@ -391,7 +391,7 @@ AutomationList::set_state (const XMLNode& node, int version) fast_simple_add (x, y); } - ControlList::thaw (); + thaw (); return 0; } diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 9079453f..00b876d1 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -167,8 +167,9 @@ ControlList::maybe_signal_changed () { mark_dirty (); - if (_frozen) + if (_frozen) { _changed_when_thawed = true; + } } void -- 2.11.4.GIT