obs-vst: Use deleteLater on editorWidget to prevent crash (#92)

* obs-vst: Fix crash that we should delete widget later * obs-vst: Make sure effEditClose won't be called again * clang format Co-authored-by: wangshaohui <[email protected]>
obsproject · Nov 24, 2021 · 50c1999 · 50c1999
1 parent 6809b0d
commit 50c1999
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/VSTPlugin.cpp b/VSTPlugin.cpp
@@ -170,7 +170,8 @@ bool VSTPlugin::isEditorOpen()
 void VSTPlugin::openEditor()
 {
 	if (effect && !editorWidget) {
-		editorWidget = new EditorWidget(nullptr, this);
+		editorOpenned = true;
+		editorWidget  = new EditorWidget(nullptr, this);
 		editorWidget->buildEffectContainer(effect);
 
 		if (sourceName.empty()) {
@@ -189,13 +190,14 @@ void VSTPlugin::openEditor()
 
 void VSTPlugin::closeEditor()
 {
-	if (effect) {
-		effect->dispatcher(effect, effEditClose, 0, 0, nullptr, 0);
-	}
-
 	if (editorWidget) {
+		if (effect && editorOpenned) {
+			editorOpenned = false;
+			effect->dispatcher(effect, effEditClose, 0, 0, nullptr, 0);
+		}
+
 		editorWidget->close();
-		delete editorWidget;
+		editorWidget->deleteLater();
 		editorWidget = nullptr;
 	}
 }

diff --git a/headers/VSTPlugin.h b/headers/VSTPlugin.h
@@ -45,7 +45,8 @@ class VSTPlugin : public QObject {
 	float **inputs;
 	float **outputs;
 
-	EditorWidget *editorWidget = nullptr;
+	EditorWidget *editorWidget  = nullptr;
+	bool          editorOpenned = false;
 
 	AEffect *loadEffect();