lincoln's route connection cleanup patch

git-svn-id: svn://localhost/ardour2/branches/3.0@4996 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 13 deletions

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 2f858f99a0..1b9b2a85df 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -78,7 +78,7 @@ Editor::show_editor_mixer (bool yn)
 	if (yn) {
 
 		if (selection->tracks.empty()) {
-			
+
 			if (track_views.empty()) {	
 				show_editor_mixer_when_tracks_arrive = true;
 				return;
@@ -94,7 +94,6 @@ Editor::show_editor_mixer (bool yn)
 			}
 
 		} else {
-
 			sort_track_selection ();
 			
 			for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
@@ -183,7 +182,6 @@ void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
 	RouteTimeAxisView* at;
-	bool show = false;
 	bool created;
 
 	if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
@@ -191,6 +189,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 	}
 
 	Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
+	
 	if (act) {
 		Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
 		if (!tact || !tact->get_active()) {
@@ -212,19 +211,11 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		return;
 	}
 	
-	if (current_mixer_strip->get_parent()) {
-		show = true;
-	}
-
-	current_mixer_strip->set_route (at->route());
-
 	if (created) {
 		current_mixer_strip->set_width (editor_mixer_strip_width, (void*) this);
 	}
 
-	if (show) {
-		show_editor_mixer (true);
-	}
+	current_mixer_strip->set_route (at->route());
 }
 
 double current = 0.0;
@@ -300,7 +291,6 @@ Editor::update_current_screen ()
 			}
 
 		} else {
-			
 			if (frame != last_update_frame) {
 				playhead_cursor->set_position (frame);
 			}