From 6bd49ff415b6d3a050855010b20d59403fedf6ab Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Wed, 8 Feb 2023 19:10:14 -0500 Subject: [PATCH] Protect against server crash when DHooks cannot load from SDKHooks not being loaded. (#1930) --- extensions/dhooks/extension.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extensions/dhooks/extension.cpp b/extensions/dhooks/extension.cpp index 3d0ff9b7..dbd11055 100644 --- a/extensions/dhooks/extension.cpp +++ b/extensions/dhooks/extension.cpp @@ -119,7 +119,10 @@ void DHooks::SDK_OnAllLoaded() SM_GET_LATE_IFACE(BINTOOLS, g_pBinTools); SM_GET_LATE_IFACE(SDKHOOKS, g_pSDKHooks); - g_pSDKHooks->AddEntityListener(g_pEntityListener); + if (g_pSDKHooks) + { + g_pSDKHooks->AddEntityListener(g_pEntityListener); + } gameconfs->AddUserConfigHook("Functions", g_pSignatures); } @@ -131,7 +134,10 @@ void DHooks::SDK_OnUnload() { g_pEntityListener->CleanupListeners(); g_pEntityListener->CleanupRemoveList(); - g_pSDKHooks->RemoveEntityListener(g_pEntityListener); + if (g_pSDKHooks) + { + g_pSDKHooks->RemoveEntityListener(g_pEntityListener); + } delete g_pEntityListener; } plsys->RemovePluginsListener(this);