From 75822327172aac61e3834ebdeb91f799c210345c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 6 Jul 2012 22:24:29 +0000
Subject: fix for the problem with UserInfoEx

git-svn-id: http://svn.miranda-ng.org/main/trunk@804 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/plugins/newplugins.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/modules/plugins/newplugins.cpp')

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 7e4e9ac80c..24a4881521 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -333,12 +333,16 @@ int Plugin_UnloadDyn(pluginEntry* p)
 	}
 			
 	// release default plugin
-	if ( !(p->pclass & PCLASS_CORE))
+	bool bCore = (p->pclass & PCLASS_CORE) != 0;
+	Plugin_Uninit(p);
+
+	if ( !bCore )
 		for (int i=0; i < SIZEOF(pluginDefault); i++)
-			if (pluginDefault[i].pImpl == p)
+			if (pluginDefault[i].pImpl == p) {
+				pluginDefault[i].pImpl = NULL;
 				LoadCorePlugin( pluginDefault[i] );
+			}
 
-	Plugin_Uninit(p);
 	return TRUE;
 }
 
-- 
cgit v1.2.3