From dbb26485df31bbf3bd0aeb83e3e01d42e25fbd07 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 28 Jun 2016 18:43:31 +0200
Subject: [PATCH] ignore automation for non-automatables.

Since 4.7-1477-g2c6d595 Ardour implements Control::NotAutomatable.
This can lead to situations where automation exists for parameters that
were not supposed to be automatable, which in turn caused a
"programming-error" abort() in
RouteTimeAxisView::add_processor_automation_curve()
---
 libs/ardour/automatable.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index e108676fa7..dfc7be417a 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -233,7 +233,12 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
 			if (param.type() == NullAutomation) {
 				warning << "Automation has null type" << endl;
 				continue;
-                        }
+			}
+
+			if (_can_automate_list.find (param) == _can_automate_list.end ()) {
+				warning << "Ignored automation data for non-automatable parameter" << endl;
+				continue;
+			}
 
 			if (!id_prop) {
 				warning << "AutomationList node without automation-id property, "