diff options
Diffstat (limited to 'src/modules/plugins/newplugins.cpp')
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 3a07390076..ad6206eaf4 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -475,11 +475,13 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic) for (int i=0; !equalUUID(miid_last, piface[i]); i++) {
int idx = getDefaultPluginIdx( piface[i] );
if (idx != -1 && pluginDefault[idx].pImpl) {
- if ( bModulesLoadedFired && !bDynamic) {
+ if (!bDynamic) { // this place is already occupied, skip & disable
SetPluginOnWhiteList(p->pluginname, 0);
return false;
}
- if (bDynamic && !(p->pclass & PCLASS_CORE)) {
+
+ // we're loading new implementation dynamically, let the old one die
+ if ( !(p->pclass & PCLASS_CORE)) {
Plugin_UnloadDyn(pluginDefault[idx].pImpl);
pluginDefault[idx].pImpl = NULL;
} } } }
|