From c8f030d40167467070c30149209e5aeece10b915 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 14 Aug 2012 17:35:00 +0000
Subject: =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=B3=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B8=20-=20=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5=20?=
 =?UTF-8?q?=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.miranda-ng.org/main/trunk@1455 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/plugins/dll_sniffer.cpp | 3 +++
 src/modules/plugins/newplugins.cpp  | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

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);
 	}
 
-- 
cgit v1.2.3