From 5ec70c9e0ddd6742991146015fe62f51e0ccdab2 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 17 Oct 2011 10:47:13 -0400 Subject: [PATCH] Fixed shutdown bug in SDKTools (created EntOutputMgr shutdown func) (bug 5063, r=fyren). --- extensions/sdktools/extension.cpp | 1 + extensions/sdktools/output.cpp | 2 +- extensions/sdktools/output.h | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/sdktools/extension.cpp b/extensions/sdktools/extension.cpp index 9b3f42e5..04b4f946 100644 --- a/extensions/sdktools/extension.cpp +++ b/extensions/sdktools/extension.cpp @@ -202,6 +202,7 @@ void SDKTools::SDK_OnUnload() s_TempEntHooks.Shutdown(); s_SoundHooks.Shutdown(); g_Hooks.Shutdown(); + g_OutputManager.Shutdown(); gameconfs->CloseGameConfigFile(g_pGameConf); playerhelpers->RemoveClientListener(&g_SdkTools); diff --git a/extensions/sdktools/output.cpp b/extensions/sdktools/output.cpp index c5308550..2960212a 100644 --- a/extensions/sdktools/output.cpp +++ b/extensions/sdktools/output.cpp @@ -44,7 +44,7 @@ EntityOutputManager::EntityOutputManager() enabled = false; } -EntityOutputManager::~EntityOutputManager() +void EntityOutputManager::Shutdown() { if (!enabled) { diff --git a/extensions/sdktools/output.h b/extensions/sdktools/output.h index 89abc4dc..dfd79a27 100644 --- a/extensions/sdktools/output.h +++ b/extensions/sdktools/output.h @@ -90,10 +90,9 @@ class EntityOutputManager : public IPluginsListener { public: EntityOutputManager(); - ~EntityOutputManager(); public: void Init(); - + void Shutdown(); bool IsEnabled(); void FireEventDetour(void *pOutput, CBaseEntity *pActivator, CBaseEntity *pCaller, float fDelay);