From ae837b49ed8d00c484cf7e99f3485e67c94daf79 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 10 Jun 2017 12:04:27 -0400 Subject: semantically more correct ordering of previous commit --- libs/ardour/control_protocol_manager.cc | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'libs') diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 7205b3e79e..8616848467 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -87,27 +87,11 @@ ControlProtocolManager::set_session (Session* s) { SessionHandlePtr::set_session (s); - if (_session) { - - /* get selection info and set it before instantiating any - * control protocols. - */ - - CoreSelection::StripableAutomationControls sac; - _session->selection().get_stripables (sac); - - if (!sac.empty()) { - StripableNotificationListPtr v (new StripableNotificationList); - for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) { - if ((*i).stripable) { - v->push_back (boost::weak_ptr ((*i).stripable)); - } - } - if (!v->empty()) { - StripableSelectionChanged (v); /* EMIT SIGNAL */ - } - } + if (!_session) { + return; + } + { Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { @@ -116,6 +100,21 @@ ControlProtocolManager::set_session (Session* s) } } } + + CoreSelection::StripableAutomationControls sac; + _session->selection().get_stripables (sac); + + if (!sac.empty()) { + StripableNotificationListPtr v (new StripableNotificationList); + for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) { + if ((*i).stripable) { + v->push_back (boost::weak_ptr ((*i).stripable)); + } + } + if (!v->empty()) { + StripableSelectionChanged (v); /* EMIT SIGNAL */ + } + } } int -- cgit v1.2.3