Fix RemoteVstPlugin not exiting when effect removed

LMMS · Apr 12, 2018 · eb560a7 · eb560a7
1 parent 4ba0861
commit eb560a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -60,7 +60,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 	if( _ctl != NULL && _ctl->m_effect != NULL &&
 					_ctl->m_effect->m_plugin != NULL )
 	{
-		m_plugin = _ctl->m_effect->m_plugin;
+		m_plugin = _ctl->m_effect->m_plugin.data();
 		embed_vst = m_plugin->embedMethod() != "none";
 		m_needsEmbed = embed_vst;
 
@@ -85,7 +85,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 					SLOT( togglePluginUI( bool ) ) );
 		} else {
 			connect( btn, SIGNAL( clicked() ),
-					m_plugin.data(), SLOT( toggleUI() ) );
+					m_plugin, SLOT( toggleUI() ) );
 		}
 
 		btn->setMinimumWidth( 78 );

diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h
@@ -31,7 +31,7 @@
 #include <QObject>
 #include <QPainter>
 #include <QLabel>
-#include <QSharedPointer>
+#include <QPointer>
 #if defined(LMMS_BUILD_LINUX) && QT_VERSION < 0x050000
 #	include <QShowEvent>
 #endif
@@ -67,7 +67,7 @@ class VstEffectControlDialog : public EffectControlDialog
 	PixmapButton * m_managePluginButton;
 	PixmapButton * m_savePresetButton;
 
-	QSharedPointer<VstPlugin> m_plugin;
+	QPointer<VstPlugin> m_plugin;
 
 	QLabel * tbLabel;