fixed incorrect restore of mixer strip visibility

git-svn-id: svn://localhost/ardour2/trunk@1501 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 6 insertions, 5 deletions

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index dc7189194e..5c93882c6d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -389,8 +389,7 @@ MixerStrip::set_stuff_from_route ()
 		} else {
 			_marked_for_display = true;
 		}
-	}
-	else {
+	} else {
 		/* backwards compatibility */
 		_marked_for_display = true;
 	}
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index c0c42a66be..f1f8714e80 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -279,7 +279,7 @@ Mixer_UI::add_strip (Session::RouteList& routes)
 		TreeModel::Row row = *(track_model->append());
 		row[track_columns.text] = route->name();
 		
-		row[track_columns.visible] = true;
+		row[track_columns.visible] = strip->marked_for_display();
 		row[track_columns.route] = route;
 		row[track_columns.strip] = strip;
 		
@@ -614,8 +614,10 @@ Mixer_UI::redisplay_track_list ()
 			if (strip->route()->master() || strip->route()->control()) {
 				/* do nothing, these cannot be hidden */
 			} else {
-				strip_packer.remove (*strip);
-				strip->set_packed (false);
+				if (strip->packed()) {
+					strip_packer.remove (*strip);
+					strip->set_packed (false);
+				}
 			}
 		}
 	}