From 4e54953f01c24808ae9d4ff674ae5afaa4446275 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 17 Oct 2018 12:27:23 +0100 Subject: [PATCH] Unity: Initialise JUCE GUI earlier to avoid hitting some assertions --- .../Unity/juce_Unity_Wrapper.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp index deff8da598..847e26c20a 100644 --- a/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/Unity/juce_Unity_Wrapper.cpp @@ -505,9 +505,6 @@ namespace UnityCallbacks { int UNITY_INTERFACE_API createCallback (UnityAudioEffectState* state) { - if (getWrapperMap().size() == 0) - initialiseJuce_GUI(); - auto* pluginInstance = new AudioProcessorUnityWrapper (false); pluginInstance->create (state); @@ -671,14 +668,16 @@ static void declareEffect (UnityAudioEffectDefinition& definition) UNITY_INTERFACE_EXPORT int UnityGetAudioEffectDefinitions (UnityAudioEffectDefinition*** definitionsPtr) { - static bool hasSetWrapperType = false; + static bool hasInitialised = false; - if (! hasSetWrapperType) + if (! hasInitialised) { + juce::initialiseJuce_GUI(); + juce::PluginHostType::jucePlugInClientCurrentWrapperType = juce::AudioProcessor::wrapperType_Unity; juce::juce_createUnityPeerFn = juce::createUnityPeer; - hasSetWrapperType = true; + hasInitialised = true; } auto* definition = new UnityAudioEffectDefinition();