summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-10-17 14:36:40 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-10-17 14:36:40 +0000
commitcff8a65db2c1dc7c96e9591370d01f8da5b1f324 (patch)
tree5a40ac2f865385b151a8021b77a030b40088e13a /libs/surfaces
parentf4ae7cc709d5c828bbba9bc0ca35ea72d87bb29f (diff)
forward part the backend part of the generic MIDI control fixes from mb2/a2
git-svn-id: svn://localhost/ardour2/branches/3.0@13297 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/generic_midi/generic_midi_control_protocol.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index e23e8725ae..8039e552e9 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -539,13 +539,11 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
Glib::Threads::Mutex::Lock lm2 (controllables_lock);
controllables.clear ();
nlist = node.children(); // "Controls"
-
+
if (nlist.empty()) {
return 0;
}
-
- nlist = nlist.front()->children ();
-
+
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((prop = (*niter)->property ("id")) != 0) {