13
0

[Summary] Sort the routes of session before creating time axises unconditionally. This will keep tracks sorted even in case a new session created from template.

Conflicts:
	gtk2_ardour/editor_routes.cc
This commit is contained in:
Valeriy Kamyshniy 2015-04-02 20:50:41 +03:00 committed by Paul Davis
parent b2da3bccc0
commit 448b6f0cc7

View File

@ -1389,29 +1389,10 @@ EditorRoutes::initial_display ()
return;
}
boost::shared_ptr<RouteList> routes = _session->get_routes();
if (ARDOUR_UI::instance()->session_is_new ()) {
/* new session: stamp all routes with the right editor order
* key
*/
_editor->add_routes (*(routes.get()));
} else {
/* existing session: sort a copy of the route list by
* editor-order and add its contents to the display.
*/
RouteList r (*routes);
EditorOrderRouteSorter sorter;
r.sort (sorter);
_editor->add_routes (r);
}
RouteList r (*_session->get_routes());
r.sort (EditorOrderRouteSorter ());
_editor->add_routes (r);
}
void