fix(unload): Crashes

Author: skuzzis

src/core/entrypoint.cpp

@@ -78,6 +78,8 @@ SH_DECL_HOOK8_void(IGameEventSystem, PostEventAbstract, SH_NOATTRIB, 0, CSplitSc
 SH_DECL_HOOK3(IVEngineServer2, SetClientListening, SH_NOATTRIB, 0, bool, CPlayerSlot, CPlayerSlot, bool);
 SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, CPlayerSlot, const CCommand&);
 
+bool shuttingDown = false;
+
 //////////////////////////////////////////////////////////////
 /////////////////  Core Variables & Functions  //////////////
 ////////////////////////////////////////////////////////////
@@ -216,6 +218,8 @@ bool SwiftlyS2::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, boo
 
 bool SwiftlyS2::Unload(char* error, size_t maxlen)
 {
+    shuttingDown = true;
+
     g_pluginManager.StopPlugins(false);
     g_pluginManager.UnloadPlugins();
 

src/memory/hooks/functions.cpp

@@ -61,11 +61,15 @@ void FunctionHook::Initialize()
     hookFunc->addCallback(m_callbackType, m_handler);
 }
 
+extern bool shuttingDown;
+
 FunctionHook::~FunctionHook()
 {
     Disable();
     if (!m_pfn) return;
 
+    if (shuttingDown) return;
+
     dyno::IHookManager& manager = dyno::IHookManager::Get();
     manager.unhookDetour(m_pfn);
 }

src/memory/hooks/vfunctions.cpp

@@ -24,11 +24,15 @@ VFunctionHook::VFunctionHook(std::string library, std::string vtable, std::strin
     m_function_return = function_return;
 }
 
+extern bool shuttingDown;
+
 VFunctionHook::~VFunctionHook()
 {
     Disable();
     if (!m_pvtable) return;
 
+    if (shuttingDown) return;
+
     dyno::IHookManager& manager = dyno::IHookManager::Get();
     manager.unhookVirtual(m_pvtable, m_ioffset);
 }

src/plugins/manager.cpp

@@ -97,8 +97,11 @@ void PluginsManager::UnloadPlugin(std::string plugin_name)
 
     for (auto it = pluginsList.begin(); it != pluginsList.end(); ++it)
     {
-        if ((*it)->GetName() == plugin_name)
+        if ((*it)->GetName() == plugin_name) {
+            delete (*it);
             pluginsList.erase(it);
+            break;
+        }
     }
 
     pluginsMap.erase(plugin_name);