Identities are now dropped before extensions unload.

--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402415
2008-07-13 05:36:52 +00:00
parent c75d607a00
commit dd75e88cbb
1 changed files with 7 additions and 4 deletions
@@ -787,10 +787,6 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)

 		/* Unbind our natives from Core */
 		pExt->DropEverything();
-
-		/* Tell it to unload */
-		pAPI = pExt->GetAPI();
-		pAPI->OnExtensionUnload();
 	}

 	IdentityToken_t *pIdentity;
@@ -804,6 +800,13 @@ bool CExtensionManager::UnloadExtension(IExtension *_pExt)
 		}
 	}

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