Don't mess with the track selection at all from the editor route list
authornick_m <mainsbridge@gmail.com>
Thu, 12 Mar 2015 17:01:55 +0000 (04:01 +1100)
committernick_m <mainsbridge@gmail.com>
Thu, 12 Mar 2015 17:01:55 +0000 (04:01 +1100)
when adding tracks (thinko in last commit).

gtk2_ardour/editor.cc
gtk2_ardour/editor_routes.cc

index 6f2773e138be2ccf4363a064a79260a29de84499..f20b24a80bc810dcb8d90fa961b7fa3efeb9af86 100644 (file)
@@ -5258,6 +5258,7 @@ Editor::add_routes (RouteList& routes)
        }
 
        if (!from_scratch) {
+               selection->tracks.clear();
                selection->add (new_selection);
                begin_selection_op_history();
        }
index e7a49105f358ef4b61bcfa435d12ba8ade7f8c51..5ca5f67f423a4fc5416b340f1f4c7de0fcd5e5a1 100644 (file)
@@ -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>());