projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
359e63f
)
Fully restore ARDOUR::SoloSafeControl state
author
Tim Mayberry
<mojofunk@gmail.com>
Tue, 20 Sep 2016 05:39:10 +0000
(15:39 +1000)
committer
Tim Mayberry
<mojofunk@gmail.com>
Tue, 20 Sep 2016 05:52:31 +0000
(15:52 +1000)
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.
libs/ardour/solo_safe_control.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/solo_safe_control.cc
b/libs/ardour/solo_safe_control.cc
index 92c6c9ec206305aa9d227ae86ef2886ac1d814cc..01d56ddf58eed536a5c54e66d1d687a3eb97684b 100644
(file)
--- a/
libs/ardour/solo_safe_control.cc
+++ b/
libs/ardour/solo_safe_control.cc
@@
-66,8
+66,12
@@
SoloSafeControl::get_value () const
}
int
-SoloSafeControl::set_state (XMLNode const & node, int)
+SoloSafeControl::set_state (XMLNode const & node, int
version
)
{
+ if (SlavableAutomationControl::set_state(node, version)) {
+ return -1;
+ }
+
XMLProperty const * prop;
if ((prop = node.property ("solo-safe")) != 0) {