From 13097624def03763998de3d5dd2f8b9477d4e51d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 30 Jul 2012 14:23:21 +0000
Subject: fix to avoid the DbChecker's call after database opening

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

(limited to 'src')

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 359b2705e3..93a7673895 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -643,16 +643,13 @@ void EnsureCheckerLoaded(bool bEnable)
 			if ( !(p->pclass & PCLASS_LOADED)) {
 				if (p->bpi.Load() != ERROR_SUCCESS)
 					Plugin_Uninit(p);
-				else
+				else {
 					p->pclass |= PCLASS_LOADED;
+					servicePlugins.remove(i);
+				}
 			}
 		}
-		else {
-			if (p->pclass & PCLASS_LOADED) {
-				p->bpi.Unload();
-				p->pclass &= ~PCLASS_LOADED;
-			}
-		}
+		else Plugin_Uninit(p);
 		break;
 	}
 }
-- 
cgit v1.2.3