From 7ae348eb10f99392d589f2dd99acd7d5e458c8c3 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Wed, 29 Nov 2017 15:33:44 +0100
Subject: [PATCH] Vst refactorings

---
 plugins/VstEffect/VstEffectControlDialog.cpp | 15 +++------------
 plugins/vst_base/VstPlugin.cpp               | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
index 39c00fc1d..021fae490 100644
--- a/plugins/VstEffect/VstEffectControlDialog.cpp
+++ b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -218,14 +218,12 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		m_savePresetButton->setMinimumHeight( 21 );
 		m_savePresetButton->setMaximumHeight( 21 );
 
-		int newSize;
+		int newSize = 0;
 
 		if (embed_vst) {
 			newSize = m_pluginWidget->width() + 20;
-			newSize = (newSize < 250) ? 250 : newSize;
-		} else {
-			newSize = 250;
 		}
+		newSize = std::max(newSize, 250);
 
 		QWidget* resize = new QWidget(this);
 		resize->resize( newSize, 10 );
@@ -294,13 +292,6 @@ void VstEffectControlDialog::togglePluginUI( bool checked )
 		return;
 	}
 
-	if( ConfigManager::inst()->vstEmbedMethod() != "none" )
-	{
-		m_pluginWidget->setVisible( checked );
-	}
-	else
-	{
-		m_plugin->toggleUI();
-	}
+	m_plugin->toggleUI();
 }
 
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 31f171969..e291e15ba 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -361,17 +361,19 @@ void VstPlugin::setParameterDump( const QMap<QString, QString> & _pdump )
 
 QWidget *VstPlugin::pluginWidget(bool _top_widget)
 {
-	if ( m_embedMethod != "none" )
+	if ( m_embedMethod == "none" || !m_pluginWidget )
 	{
-		if( _top_widget && m_pluginWidget )
-		{
-			if( m_pluginWidget->parentWidget() )
-			{
-				return m_pluginWidget->parentWidget();
-			}
-		}
+		return nullptr;
+	}
+
+	if ( _top_widget && m_pluginWidget->parentWidget() == m_pluginSubWindow )
+	{
+		return m_pluginSubWindow;
+	}
+	else
+	{
+		return m_pluginWidget;
 	}
-	return m_pluginWidget;
 }