Always call set_width_enum after set_route on mixer strips, to ensure that width is correctly set to editor_mixer_strip_width (as set_route will probably call set_width_enum itself)

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

1 files changed, 2 insertions, 17 deletions

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 0903de68ff..6f858b19ae 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -111,20 +111,12 @@ Editor::show_editor_mixer (bool yn)
 		}
 
 		if (r) {
-			bool created;
-
 			if (current_mixer_strip == 0) {
 				create_editor_mixer ();
-				created = true;
-			} else {
-				created = false;
 			}
 
 			current_mixer_strip->set_route (r);
-
-			if (created) {
-				current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
-			}
+			current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
 		}
 
 		if (current_mixer_strip->get_parent() == 0) {
@@ -186,7 +178,6 @@ void
 Editor::set_selected_mixer_strip (TimeAxisView& view)
 {
 	RouteTimeAxisView* at;
-	bool created;
 
 	if (!session || (at = dynamic_cast<RouteTimeAxisView*>(&view)) == 0) {
 		return;
@@ -204,9 +195,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
 	if (current_mixer_strip == 0) {
 		create_editor_mixer ();
-		created = true;
-	} else {
-		created = false;
 	}
 
 	/* might be nothing to do */
@@ -215,11 +203,8 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 		return;
 	}
 
-	if (created) {
-		current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
-	}
-
 	current_mixer_strip->set_route (at->route());
+	current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
 }
 
 double current = 0.0;