From 96d628896f84e7ac6cdf80195bff120ec4f5cdd7 Mon Sep 17 00:00:00 2001 From: Hyunin Song Date: Sun, 29 Apr 2018 13:11:27 +0900 Subject: [PATCH] Revert "Fix RemoteVstPlugin not exiting when effect removed" This reverts commit eb560a780f8bb02cc4bbc02ca893eb1b850b9b47. --- plugins/VstEffect/VstEffectControlDialog.cpp | 4 ++-- plugins/VstEffect/VstEffectControlDialog.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp index ce1f781450b..8d63b4cb257 100644 --- a/plugins/VstEffect/VstEffectControlDialog.cpp +++ b/plugins/VstEffect/VstEffectControlDialog.cpp @@ -59,7 +59,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.data(); + m_plugin = _ctl->m_effect->m_plugin; embed_vst = m_plugin->embedMethod() != "none"; if (embed_vst) { @@ -83,7 +83,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : SLOT( togglePluginUI( bool ) ) ); } else { connect( btn, SIGNAL( clicked() ), - m_plugin, SLOT( toggleUI() ) ); + m_plugin.data(), SLOT( toggleUI() ) ); } btn->setMinimumWidth( 78 ); diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 954681d3dbf..e2091501931 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include class VstEffectControls; @@ -61,7 +61,7 @@ class VstEffectControlDialog : public EffectControlDialog PixmapButton * m_managePluginButton; PixmapButton * m_savePresetButton; - QPointer m_plugin; + QSharedPointer m_plugin; QLabel * tbLabel;