UI: Add editor_mixer route pointer to session so all UIs can know the same current_strip even in a selected group.

1 files changed, 16 insertions, 15 deletions

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 0109aa38c1..67b33a6c87 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -197,21 +197,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		return;
 	}
 
-	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()) {
-			/* not showing mixer strip presently */
-			return;
-		}
-	}
-
-	if (current_mixer_strip == 0) {
-		create_editor_mixer ();
-	}
-
-
 	// if this is an automation track, then we shold the mixer strip should
 	// show the parent
 
@@ -240,6 +225,22 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		}
 	}
 
+	_session->set_editor_mixer (route);
+
+	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()) {
+			/* not showing mixer strip presently */
+			return;
+		}
+	}
+
+	if (current_mixer_strip == 0) {
+		create_editor_mixer ();
+	}
+
 	if (current_mixer_strip->route() == route) {
 		return;
 	}