ardour/livetrax
13
0
Fork 0
Code

fix logic when removing routes

Browse Source 
Selection change and re-order signals are distinct.
This commit is contained in:
Paul Davis 2017-05-08 10:56:24 +01:00
parent 7b2063d62d
commit 0596032b36
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/session.cc
View File

@ -3825,22 +3825,23 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
routes.flush ();
/* try to cause everyone to drop their references
* and unregister ports from the backend
/* remove these routes from the selection if appropriate, and signal
* the change *before* we call DropReferences for them.
*/
if (send_selected && !deletion_in_progress()) {
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
_selection->remove_stripable_by_id ((*iter)->id());
}
PropertyChange so;
so.add (Properties::order);
if (send_selected) {
so.add (Properties::selected);
}
PresentationInfo::Change (so);
PropertyChange pc;
pc.add (Properties::selected);
PresentationInfo::Change (pc);
}
/* try to cause everyone to drop their references
* and unregister ports from the backend
*/
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
(*iter)->drop_references ();
}
@ -3849,6 +3850,9 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
return;
}
PropertyChange pc;
pc.add (Properties::selected);
PresentationInfo::Change (pc);
/* save the new state of the world */