From db680ab6d3d115e22eb8cf0a39340de9335aae7d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Thu, 9 Sep 2010 01:38:02 +0000
Subject: [PATCH] Fix crossfade visibility on startup so that it respects the
 configured setting.

git-svn-id: svn://localhost/ardour2/branches/3.0@7757 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/audio_streamview.cc | 6 ++----
 gtk2_ardour/crossfade_view.cc   | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 1bf1855167..accc5b7ea4 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -61,7 +61,7 @@ using namespace Editing;
 AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
 	: StreamView (tv)
 {
-	crossfades_visible = true;
+	crossfades_visible = tv.session()->config.get_xfades_visible ();
 	color_handler ();
 	_amplitude_above_axis = 1.0;
 
@@ -329,7 +329,7 @@ AudioStreamView::add_crossfade (boost::weak_ptr<Crossfade> wc)
 	cv->set_valid (true);
 	crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context());
 	crossfade_views[cv->crossfade] = cv;
-	if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) {
+	if (!crossfades_visible) {
 		cv->hide ();
 	}
 
@@ -795,8 +795,6 @@ AudioStreamView::update_contents_height ()
 void
 AudioStreamView::update_content_height (CrossfadeView* cv)
 {
-	cv->show ();
-
 	if (_layer_display == Overlaid) {
 
 		cv->set_y (0);
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index 899ac3c917..bc8521dbc2 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -185,7 +185,7 @@ CrossfadeView::redraw_curves ()
 		p.set_x (i + 1);
 		p.set_y (_height - ((_height - 2) * vec[i]));
 	}
-	
+
 	fade_in->property_points() = *points;
 
 	crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints);
@@ -246,8 +246,9 @@ CrossfadeView::upper_regionview () const
 void
 CrossfadeView::show ()
 {
-	group->show();
 	_visible = true;
+	group->show();
+	redraw_curves ();
 }
 
 void