diff --git a/NorthstarDLL/dllmain.cpp b/NorthstarDLL/dllmain.cpp index cfcc1a8c3..1a80b3edb 100644 --- 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 index 091ddd2f8..f97662358 100644 --- 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 lock(requestMutex); diff --git a/NorthstarDLL/plugins/pluginbackend.h b/NorthstarDLL/plugins/pluginbackend.h index 898b3a994..bcbccbd8e 100644 --- a/NorthstarDLL/plugins/pluginbackend.h +++ b/NorthstarDLL/plugins/pluginbackend.h @@ -33,12 +33,10 @@ class PluginCommunicationHandler void GeneratePresenceObjects(); public: - std::queue requestQueue; + std::queue requestQueue = {}; std::mutex requestMutex; PluginEngineData m_sEngineData {}; }; -void init_plugincommunicationhandler(); - extern PluginCommunicationHandler* g_pPluginCommunicationhandler; diff --git a/NorthstarDLL/plugins/plugins.cpp b/NorthstarDLL/plugins/plugins.cpp index 0c4c7fd60..5e28e12d0 100644 --- 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;