summaryrefslogtreecommitdiff
path: root/src/modules/plugins/newplugins.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-30 14:23:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-30 14:23:21 +0000
commit13097624def03763998de3d5dd2f8b9477d4e51d (patch)
tree7bec532d1ac0e57ee98a0561ce99ce7254342bed /src/modules/plugins/newplugins.cpp
parentdafcac872a4631fef8d3ba4c8e895e4316b88814 (diff)
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
Diffstat (limited to 'src/modules/plugins/newplugins.cpp')
-rw-r--r--src/modules/plugins/newplugins.cpp11
1 files changed, 4 insertions, 7 deletions
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;
}
}