From caa0fc9b70efbf6fd4fc16f027914e8dd2f76f27 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 28 Mar 2022 20:21:02 +0100
Subject: [PATCH] VST3: unregister native callback before destroying window

Signed-off-by: falkTX <falktx@falktx.com>
---
 distrho/src/DistrhoUIVST3.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/distrho/src/DistrhoUIVST3.cpp b/distrho/src/DistrhoUIVST3.cpp
index 154b98c6..f6697f2e 100644
--- a/distrho/src/DistrhoUIVST3.cpp
+++ b/distrho/src/DistrhoUIVST3.cpp
@@ -182,11 +182,8 @@ public:
        #endif
     }
 
-    ~NativeIdleCallback()
+    void unregisterNativeIdleCallback()
     {
-        if (!fCallbackRegistered)
-            return;
-
        #if !DISTRHO_PLUGIN_HAS_EXTERNAL_UI
         fUI.removeIdleCallbackForVST3(this);
        #elif defined(DISTRHO_OS_MAC)
@@ -277,6 +274,10 @@ public:
 
     ~UIVst3()
     {
+       #if !DPF_VST3_USING_HOST_RUN_LOOP
+        unregisterNativeIdleCallback();
+       #endif
+
         if (fConnection != nullptr)
             disconnect();
     }