Fix crash on failing to load dependent extension.

This commit is contained in:
Asher Baker 2015-11-09 14:56:42 +00:00
parent c3e5d62bf6
commit b81b6cd1c6

View File

@ -297,16 +297,15 @@ bool CExtension::Load(char *error, size_t maxlength)
CreateIdentity(); CreateIdentity();
if (!m_pAPI->OnExtensionLoad(this, &g_ShareSys, error, maxlength, !bridge->IsMapLoading())) if (!m_pAPI->OnExtensionLoad(this, &g_ShareSys, error, maxlength, !bridge->IsMapLoading()))
{ {
g_ShareSys.RemoveInterfaces(this);
DestroyIdentity(); DestroyIdentity();
return false; return false;
} }
else
/* Check if we're past load time */
if (!bridge->IsMapLoading())
{ {
/* Check if we're past load time */ m_pAPI->OnExtensionsAllLoaded();
if (!bridge->IsMapLoading())
{
m_pAPI->OnExtensionsAllLoaded();
}
} }
return true; return true;