- cherry picked logic server fix into master

christophhart · Aug 26, 2021 · f816c4b · f816c4b
1 parent e4b8330
commit f816c4b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/hi_core/hi_core/MainController.cpp b/hi_core/hi_core/MainController.cpp
@@ -348,6 +348,8 @@ void MainController::loadPresetInternal(const ValueTree& v)
 				synth->setEditorState(Processor::EditorState::Folded, true);
 
 			changed = false;
+
+            getJavascriptThreadPool().getGlobalServer()->setInitialised();
 #endif
 
 			auto f = [](Dispatchable* obj)

diff --git a/hi_frontend/frontend/FrontEndProcessor.cpp b/hi_frontend/frontend/FrontEndProcessor.cpp
@@ -415,6 +415,8 @@ void FrontendProcessor::createPreset(const ValueTree& synthData)
 		LOG_START("Initialising audio callback");
 		synthChain->prepareToPlay(getSampleRate(), getBlockSize());
 	}
+
+    getJavascriptThreadPool().getGlobalServer()->setInitialised();
 }
 
 const String FrontendProcessor::getName(void) const

diff --git a/hi_scripting/scripting/api/GlobalServer.cpp b/hi_scripting/scripting/api/GlobalServer.cpp
@@ -106,7 +106,7 @@ void GlobalServer::WebThread::run()
 {
 	while (!threadShouldExit())
 	{
-		if (parent.getMainController()->getKillStateHandler().initialised())
+		if (parent.initialised)
 		{
 			{
 				ReferenceCountedArray<ScriptingObjects::ScriptDownloadObject> thisList;

diff --git a/hi_scripting/scripting/api/GlobalServer.h b/hi_scripting/scripting/api/GlobalServer.h
@@ -200,8 +200,15 @@ struct GlobalServer: public ControlledObject
 
 	juce::URL getWithParameters(String subURL, var parameters);
 
+    void setInitialised()
+    {
+        initialised = true;
+    }
+
 private:
 
+    bool initialised = false;
+
 	struct WebThread : public Thread
 	{
 		WebThread(GlobalServer& p) :