fix crash unloading plugin

gwdevhub · Dec 17, 2024 · 5523bc4 · 5523bc4
1 parent 1776e12
commit 5523bc4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/plugins/Base/ToolboxUIPlugin.cpp b/plugins/Base/ToolboxUIPlugin.cpp
@@ -1,11 +1,9 @@
 #include "ToolboxUIPlugin.h"
 #include <imgui.h>
 
-#include <GWCA/Utilities/Hooker.h>
 #include "GWCA/Utilities/Hook.h"
 #include <GWCA/Managers/ChatMgr.h>
 
-#include <GWCA/GWCA.h>
 #include "PluginUtils.h"
 
 namespace {
@@ -62,26 +60,18 @@ bool ToolboxUIPlugin::ShowInMainMenu() const
 void ToolboxUIPlugin::Initialize(ImGuiContext* ctx, const ImGuiAllocFns allocator_fns, const HMODULE toolbox_dll)
 {
     ToolboxPlugin::Initialize(ctx, allocator_fns, toolbox_dll);
-    GW::Initialize();
     GW::Chat::CreateCommand(L"tb", CmdTB);
 }
 
-bool ToolboxUIPlugin::CanTerminate()
-{
-    return GW::Hook::GetInHookCount() == 0;
-}
-
 void ToolboxUIPlugin::SignalTerminate()
 {
     ToolboxPlugin::SignalTerminate();
     GW::Chat::DeleteCommand(L"tb");
-    GW::DisableHooks();
 }
 
 void ToolboxUIPlugin::Terminate()
 {
     ToolboxPlugin::Terminate();
-    GW::Terminate();
 }
 
 void ToolboxUIPlugin::DrawSettings()

diff --git a/plugins/Base/ToolboxUIPlugin.h b/plugins/Base/ToolboxUIPlugin.h
@@ -8,7 +8,6 @@ class ToolboxUIPlugin : public ToolboxPlugin {
     bool ShowInMainMenu() const override;
 
     void Initialize(ImGuiContext* ctx, ImGuiAllocFns allocator_fns, HMODULE toolbox_dll) override;
-    bool CanTerminate() override;
     void SignalTerminate() override;
     void Terminate() override;
     bool HasSettings() const override { return true; }

diff --git a/plugins/ExamplePlugin/ExamplePlugin.cpp b/plugins/ExamplePlugin/ExamplePlugin.cpp
@@ -4,8 +4,6 @@
 #include <GWCA/Managers/MapMgr.h>
 
 #include <Utils/GuiUtils.h>
-#include <GWCA/GWCA.h>
-#include <GWCA/Utilities/Hooker.h>
 #include "GWCA/Managers/ChatMgr.h"
 
 namespace {
@@ -52,11 +50,10 @@ void ExamplePlugin::SignalTerminate()
 {
     ToolboxUIPlugin::SignalTerminate();
     GW::Chat::DeleteCommand(L"ee");
-    GW::DisableHooks();
 }
 
 bool ExamplePlugin::CanTerminate() {
-    return GW::Hook::GetInHookCount() == 0;
+    return true;
 }
 
 void ExamplePlugin::Draw(IDirect3DDevice9*)