summaryrefslogtreecommitdiff
path: root/libs/ardour/session_state.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-10-02 16:17:22 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-10-02 16:17:22 -0400
commit82f0f3a9a76097402afae8be1c9a65d526ad8cf2 (patch)
treefe029418eed1d16f269d0529fb1f17c9ee3ebfb2 /libs/ardour/session_state.cc
parentc736d88a5f71a1e5d8c975c7222b93cdc1d4204b (diff)
fix up crash caused by changes in object creation order and setting the state of the click IO object
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r--libs/ardour/session_state.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index d96db8f188..94e9f00564 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1317,13 +1317,7 @@ Session::set_state (const XMLNode& node, int version)
if ((child = find_named_node (node, "Click")) == 0) {
warning << _("Session: XML state has no click section") << endmsg;
} else if (_click_io) {
- const XMLNodeList& children (child->children());
- XMLNodeList::const_iterator i = children.begin();
- _click_io->set_state (**i, version);
- ++i;
- if (i != children.end()) {
- _click_gain->set_state (**i, version);
- }
+ setup_click_state (node);
}
if ((child = find_named_node (node, ControlProtocolManager::state_node_name)) != 0) {