move plugin communication handler init to dllmain

ASpoonPlaysGames · Oct 15, 2023 · 1675185 · 1675185
1 parent fb7b538
commit 1675185
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/NorthstarDLL/dllmain.cpp b/NorthstarDLL/dllmain.cpp
@@ -5,6 +5,7 @@
 #include "config/profile.h"
 #include "plugins/plugin_abi.h"
 #include "plugins/plugins.h"
+#include "plugins/pluginbackend.h"
 #include "util/version.h"
 #include "squirrel/squirrel.h"
 #include "shared/gamepresence.h"
@@ -62,6 +63,7 @@ bool InitialiseNorthstar()
 
 	g_pGameStatePresence = new GameStatePresence();
 	g_pPluginManager = new PluginManager();
+	g_pPluginCommunicationhandler = new PluginCommunicationHandler();
 	g_pPluginManager->LoadPlugins();
 
 	InitialiseSquirrelManagers();

diff --git a/NorthstarDLL/plugins/pluginbackend.cpp b/NorthstarDLL/plugins/pluginbackend.cpp
@@ -15,12 +15,6 @@ PluginCommunicationHandler* g_pPluginCommunicationhandler;
 
 static PluginDataRequest storedRequest {PluginDataRequestType::END, (PluginRespondDataCallable) nullptr};
 
-void init_plugincommunicationhandler()
-{
-	g_pPluginCommunicationhandler = new PluginCommunicationHandler;
-	g_pPluginCommunicationhandler->requestQueue = {};
-}
-
 void PluginCommunicationHandler::RunFrame()
 {
 	std::lock_guard<std::mutex> lock(requestMutex);

diff --git a/NorthstarDLL/plugins/pluginbackend.h b/NorthstarDLL/plugins/pluginbackend.h
@@ -33,7 +33,7 @@ class PluginCommunicationHandler
 	void GeneratePresenceObjects();
 
   public:
-	std::queue<PluginDataRequest> requestQueue;
+	std::queue<PluginDataRequest> requestQueue = {};
 	std::mutex requestMutex;
 
 	PluginEngineData m_sEngineData {};

diff --git a/NorthstarDLL/plugins/plugins.cpp b/NorthstarDLL/plugins/plugins.cpp
@@ -226,8 +226,6 @@ bool PluginManager::LoadPlugins()
 	funcs.relayInviteFunc = nullptr;
 	funcs.createObject = CreateObject;
 
-	init_plugincommunicationhandler();
-
 	data.version = ns_version.c_str();
 	data.northstarModule = g_NorthstarModule;