From 19831f068c584e2d60f31edea70c420e48c6d12a Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Tue, 20 Sep 2016 15:12:36 +1000 Subject: [PATCH] Fully restore ARDOUR::SoloControl state This is part of a fix for bug #7025 which means the id property of PBD::Controllable is restored and a new id is not generated at first save. This also fixes restoring bindings associated SoloControl instances, which is a bit surprising hasn't been noticed/reported. --- libs/ardour/solo_control.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/ardour/solo_control.cc b/libs/ardour/solo_control.cc index c31644b026..087e5d04ab 100644 --- a/libs/ardour/solo_control.cc +++ b/libs/ardour/solo_control.cc @@ -213,8 +213,12 @@ SoloControl::clear_all_solo_state () } int -SoloControl::set_state (XMLNode const & node, int) +SoloControl::set_state (XMLNode const & node, int version) { + if (SlavableAutomationControl::set_state(node, version)) { + return -1; + } + XMLProperty const * prop; if ((prop = node.property ("self-solo")) != 0) {