From b1cadddb5d631f8fed3ffee3fd0842d9bb86664e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 6 Jul 2012 22:57:01 +0000 Subject: revert previous change git-svn-id: http://svn.miranda-ng.org/main/trunk@805 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/plugins/newplugins.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/modules/plugins') diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 24a4881521..b6120c4e01 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -333,16 +333,12 @@ int Plugin_UnloadDyn(pluginEntry* p) } // release default plugin - bool bCore = (p->pclass & PCLASS_CORE) != 0; - Plugin_Uninit(p); - - if ( !bCore ) + if ( !(p->pclass & PCLASS_CORE)) for (int i=0; i < SIZEOF(pluginDefault); i++) - if (pluginDefault[i].pImpl == p) { - pluginDefault[i].pImpl = NULL; + if (pluginDefault[i].pImpl == p) LoadCorePlugin( pluginDefault[i] ); - } + Plugin_Uninit(p); return TRUE; } @@ -563,7 +559,7 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic) for (int i=0; !equalUUID(miid_last, piface[i]); i++) { int idx = getDefaultPluginIdx( piface[i] ); if (idx != -1 && pluginDefault[idx].pImpl) { - if ( !bDynamic) { + if ( bModulesLoadedFired && !bDynamic) { SetPluginOnWhiteList(p->pluginname, 0); return false; } -- cgit v1.2.3