ardour/livetrax
13
0
Fork 0
Code

Fix crash when re-assigning groups to a disjunct set.

Browse Source 
Drag a group-tab's right-edge horizontally to the right to remove all
current routes from the groups before adding new routes to the group.

The group becomes temporarily empty, and
Session::route_removed_from_route_group() removes the group (before new
routes can be added).
This commit is contained in:
Robin Gareus 2018-03-20 18:07:55 +01:00
parent 5385aece94
commit e7f6eff84b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk2_ardour/group_tabs.cc
View File

@ -212,7 +212,15 @@ GroupTabs::on_button_release_event (GdkEventButton*)
run_new_group_dialog (&routes, false);
} else {
boost::shared_ptr<RouteList> r = _session->get_routes ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
/* First add new ones, then remove old ones.
* We cannot allow the group to become temporarily empty, because
* Session::route_removed_from_route_group() will delete empty groups.
*/
for (RouteList::const_iterator i = routes.begin(); i != routes.end(); ++i) {
/* RouteGroup::add () ignores routes already present in the set */
_dragging->group->add (*i);
}
for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
bool const was_in_tab = find (
_initial_dragging_routes.begin(), _initial_dragging_routes.end(), *i
@ -222,10 +230,9 @@ GroupTabs::on_button_release_event (GdkEventButton*)
if (was_in_tab && !now_in_tab) {
_dragging->group->remove (*i);
} else if (!was_in_tab && now_in_tab) {
_dragging->group->add (*i);
}
}
}
}