summaryrefslogtreecommitdiff
path: root/libs/ardour/solo_control.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2016-09-20 15:12:36 +1000
committerTim Mayberry <mojofunk@gmail.com>2016-09-20 15:51:16 +1000
commit19831f068c584e2d60f31edea70c420e48c6d12a (patch)
tree26e5dc2dcf8e0b16f42203e91dc02f2c6f2ae2e8 /libs/ardour/solo_control.cc
parentb6c80153c3b0306514673202bc6dd611b8a02b3e (diff)
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.
Diffstat (limited to 'libs/ardour/solo_control.cc')
-rw-r--r--libs/ardour/solo_control.cc6
1 files changed, 5 insertions, 1 deletions
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) {