From 5aacf886e1a1a9d253d3b2d1ed62bc4d86e15bb0 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Fri, 14 Dec 2012 15:05:18 -0500
Subject: [PATCH] Call OnPluginEnd before finalizer hooks have run (bug 4519,
 r=fyren).

---
 core/PluginSys.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/PluginSys.cpp b/core/PluginSys.cpp
index c8c621b1..ab04ad0b 100644
--- a/core/PluginSys.cpp
+++ b/core/PluginSys.cpp
@@ -1605,14 +1605,15 @@ bool CPluginManager::UnloadPlugin(IPlugin *plugin)
 
 	if (pPlugin->GetStatus() <= Plugin_Error)
 	{
+		/* Notify plugin */
+		pPlugin->Call_OnPluginEnd();
+
 		/* Notify listeners of unloading */
 		for (iter=m_listeners.begin(); iter!=m_listeners.end(); iter++)
 		{
 			pListener = (*iter);
 			pListener->OnPluginUnloaded(pPlugin);
 		}
-		/* Notify plugin */
-		pPlugin->Call_OnPluginEnd();
 	}
 
 	pPlugin->DropEverything();