summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2015-03-13 04:01:55 +1100
committernick_m <mainsbridge@gmail.com>2015-03-13 04:01:55 +1100
commit1a6bacb1f0eaf7d9001e2113631cf79cff80d5bb (patch)
tree903d38c998ec1bda094cf62d7f7d6bb57ea11619
parent3bd3dc04b1cffbea49abf4d16a624bd9cf5b4d20 (diff)
Don't mess with the track selection at all from the editor route list
when adding tracks (thinko in last commit).
-rw-r--r--gtk2_ardour/editor.cc1
-rw-r--r--gtk2_ardour/editor_routes.cc5
2 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6f2773e138..f20b24a80b 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5258,6 +5258,7 @@ Editor::add_routes (RouteList& routes)
}
if (!from_scratch) {
+ selection->tracks.clear();
selection->add (new_selection);
begin_selection_op_history();
}
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index e7a49105f3..5ca5f67f42 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -637,7 +637,6 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
{
PBD::Unwinder<bool> at (_adding_routes, true);
- bool from_scratch = (_model->children().size() == 0);
Gtk::TreeModel::Children::iterator insert_iter = _model->children().end();
for (Gtk::TreeModel::Children::iterator it = _model->children().begin(); it != _model->children().end(); ++it) {
@@ -649,10 +648,6 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
}
}
- if(!from_scratch) {
- _editor->selection->tracks.clear();
- }
-
DisplaySuspender ds;
_display.set_model (Glib::RefPtr<ListStore>());