Call OnPluginEnd before finalizer hooks have run (bug 4519, r=fyren).
This commit is contained in:
parent
0cae86e2ad
commit
5aacf886e1
@ -1605,14 +1605,15 @@ bool CPluginManager::UnloadPlugin(IPlugin *plugin)
|
|||||||
|
|
||||||
if (pPlugin->GetStatus() <= Plugin_Error)
|
if (pPlugin->GetStatus() <= Plugin_Error)
|
||||||
{
|
{
|
||||||
|
/* Notify plugin */
|
||||||
|
pPlugin->Call_OnPluginEnd();
|
||||||
|
|
||||||
/* Notify listeners of unloading */
|
/* Notify listeners of unloading */
|
||||||
for (iter=m_listeners.begin(); iter!=m_listeners.end(); iter++)
|
for (iter=m_listeners.begin(); iter!=m_listeners.end(); iter++)
|
||||||
{
|
{
|
||||||
pListener = (*iter);
|
pListener = (*iter);
|
||||||
pListener->OnPluginUnloaded(pPlugin);
|
pListener->OnPluginUnloaded(pPlugin);
|
||||||
}
|
}
|
||||||
/* Notify plugin */
|
|
||||||
pPlugin->Call_OnPluginEnd();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pPlugin->DropEverything();
|
pPlugin->DropEverything();
|
||||||
|
Loading…
Reference in New Issue
Block a user