diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-08-14 17:35:00 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-08-14 17:35:00 +0000 |
| commit | c8f030d40167467070c30149209e5aeece10b915 (patch) | |
| tree | 9a3d8f87809c83aa2c12b8231492b40a1b8aee71 /src/modules/plugins | |
| parent | 88fdd523bdf7cd891dbbac4b1ae7fb2ff597cea3 (diff) | |
больше гари - меньше ям
git-svn-id: http://svn.miranda-ng.org/main/trunk@1455 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/plugins')
| -rw-r--r-- | src/modules/plugins/dll_sniffer.cpp | 3 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/plugins/dll_sniffer.cpp b/src/modules/plugins/dll_sniffer.cpp index 59bcacc652..13e6a80207 100644 --- a/src/modules/plugins/dll_sniffer.cpp +++ b/src/modules/plugins/dll_sniffer.cpp @@ -123,6 +123,9 @@ MUUID* GetPluginInterfaces(const TCHAR* ptszFileName, bool& bIsPlugin) bHasMuuids = true;
pIds = (MUUID*)&pSecStart[ ptrFuncList[*ptrOrdRVA]];
}
+ // old plugin, skip it
+ else if ( !lstrcmpA(szName, "MirandaPluginInterfaces"))
+ __leave;
}
// a plugin might have no interfaces
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 3e05124b0f..9b6dbf22af 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -739,9 +739,7 @@ int LoadNewPluginsModule(void) // if Crash Dumper is present, load it to provide Crash Reports
if (pluginList_crshdmp != NULL && isPluginOnWhiteList(pluginList_crshdmp->pluginname)) {
- if (pluginList_crshdmp->bpi.Load() == 0)
- pluginList_crshdmp->pclass |= PCLASS_LOADED | PCLASS_LAST;
- else
+ if ( !TryLoadPlugin(pluginList_crshdmp, false))
Plugin_Uninit(pluginList_crshdmp);
}
|