diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-27 21:17:25 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-27 21:18:07 +0200 |
| commit | c3a868c437c44dc4ebf0429003f41e57ad98b82f (patch) | |
| tree | 841b19e4ec0ef6ff0a9281db1451948a0eef4cc9 | |
| parent | 5c2406eabd56c8017b4e2b75f67c99bf0f2d8c34 (diff) | |
fixes #1309 (black-listed plugins got loaded somehow)
| -rw-r--r-- | src/mir_app/src/newplugins.cpp | 6 |
1 files 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));
|