Merge.

2013-03-18 20:39:41 -04:00
parent 22daf26e3e d315d4bf53
commit 6d528b5c55
3 changed files with 17 additions and 37 deletions
@@ -805,6 +805,13 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 		return false;
 	}

+	/* Tell it to unload */
+	if (pExt->IsLoaded())
+	{
+		IExtensionInterface *pAPI = pExt->GetAPI();
+		pAPI->OnExtensionUnload();
+	}
+
 	/* First remove us from internal lists */
 	g_ShareSys.RemoveInterfaces(_pExt);
 	m_Libs.remove(pExt);
@@ -899,13 +906,6 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 		}
 	}

-	/* Tell it to unload */
-	if (pExt->IsLoaded())
-	{
-		IExtensionInterface *pAPI = pExt->GetAPI();
-		pAPI->OnExtensionUnload();
-	}
-
 	pExt->Unload();
 	delete pExt;