From 66b83dfaec8510ef4cf847b20257399c57f9d723 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 29 Sep 2010 16:06:29 +0200
Subject: [PATCH] SampleTrack: do not hide EffectRackView forever when closing
 subwindow

Whenever closing the sample track effects window using its own close
button and trying to open it again there was only a really small window
without functionality. Fixed this by explicitely also showing subwindow
content in showEffects().

Closes #3075205.
(cherry picked from commit 830c2cb975376299ba51e6c83c5993ab73ddc0c3)
---
 src/tracks/sample_track.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp
index db4f4c7e0..c55276c21 100644
--- a/src/tracks/sample_track.cpp
+++ b/src/tracks/sample_track.cpp
@@ -28,6 +28,7 @@
 #include <QtGui/QMenu>
 #include <QtGui/QLayout>
 #include <QtGui/QMdiArea>
+#include <QtGui/QMdiSubWindow>
 #include <QtGui/QPainter>
 #include <QtGui/QPushButton>
 
@@ -525,8 +526,7 @@ sampleTrackView::sampleTrackView( sampleTrack * _t, trackContainerView * _tcv )
 	m_effectRack = new EffectRackView( _t->audioPort()->effects() );
 	m_effectRack->setFixedSize( 240, 242 );
 
-	engine::mainWindow()->workspace()->addSubWindow( m_effectRack );
-	m_effWindow = m_effectRack->parentWidget();
+	m_effWindow = engine::mainWindow()->workspace()->addSubWindow( m_effectRack );
 	m_effWindow->setAttribute( Qt::WA_DeleteOnClose, false );
 	m_effWindow->layout()->setSizeConstraint( QLayout::SetFixedSize );
  	m_effWindow->setWindowTitle( _t->name() );
@@ -550,6 +550,7 @@ void sampleTrackView::showEffects()
 {
 	if( m_effWindow->isHidden() )
 	{
+		m_effectRack->show();
 		m_effWindow->show();
 		m_effWindow->raise();
 	}