From c3a868c437c44dc4ebf0429003f41e57ad98b82f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 27 Apr 2018 21:17:25 +0200 Subject: fixes #1309 (black-listed plugins got loaded somehow) --- src/mir_app/src/newplugins.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp index cfeca33159..9e93ea32eb 100644 --- a/src/mir_app/src/newplugins.cpp +++ b/src/mir_app/src/newplugins.cpp @@ -518,10 +518,10 @@ int isPluginOnWhiteList(const wchar_t* pluginname) bool TryLoadPlugin(pluginEntry *p, bool bDynamic) { - if (p->bpi.hInst == nullptr) { - if (!bDynamic && !isPluginOnWhiteList(p->pluginname)) - return false; + if (!bDynamic && !isPluginOnWhiteList(p->pluginname)) + return false; + if (p->bpi.hInst == nullptr) { if (!p->bHasBasicApi) { wchar_t exe[MAX_PATH], tszFullPath[MAX_PATH]; GetModuleFileName(nullptr, exe, _countof(exe)); -- cgit v1.2.3