diff -r 897f20d42c22 -r fc3600fed257 core-legacy/vsp_bridge.cpp --- a/core-legacy/vsp_bridge.cpp Tue Nov 18 05:23:58 2008 -0600 +++ b/core-legacy/vsp_bridge.cpp Tue Nov 18 07:20:38 2008 -0600 @@ -1,5 +1,6 @@ #include #include "sourcemm.h" +#include "concommands.h" #include SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false); @@ -63,6 +64,19 @@ virtual void Unload() { + if (g_bIsTryingToUnload) + { + Error("Metamod:Source cannot be unloaded from VSP mode. Use \"meta unload\" to unload specific plugins.\n"); + return; + } + if (g_plugin_unload != NULL) + { + SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false); + SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true); + g_plugin_unload = NULL; + } + g_SMConVarAccessor.UnloadMetamodCommands(); + UnloadMetamod(false); } virtual const char *GetDescription()