diff options
| author | George Hazan <ghazan@miranda.im> | 2020-01-25 19:56:48 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-01-25 19:56:48 +0300 |
| commit | a3c013d6d824956dccebaac66c708f8c0a855167 (patch) | |
| tree | cb473ec5cb5ab7030675319edba8daf788c23a79 /src/mir_app | |
| parent | 9cca190bc3022311915eb1e95b3cc3bb89aed328 (diff) | |
fixes #2185 (Clist_modern показывается, как выгруженный, хотя он загружен)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/pluginopts.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp index d1ea1cbaf1..a4aa521d99 100644 --- a/src/mir_app/src/pluginopts.cpp +++ b/src/mir_app/src/pluginopts.cpp @@ -147,13 +147,10 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA *fd, wchar_t *path, WPARAM, LPARAM it.lParam = (LPARAM)dat;
pCtrl->InsertItem(&it);
- if (bNoCheckbox) {
+ if (bNoCheckbox)
pCtrl->SetItemState(dat->iRow, 0x3000, LVIS_STATEIMAGEMASK);
- }
- else if (isPluginOnWhiteList(fd->cFileName)) {
- if (!dat->bRequiresRestart)
- dat->bWasChecked = true;
- }
+ else if (isPluginOnWhiteList(fd->cFileName))
+ dat->bWasChecked = true;
if (dat->iRow != -1) {
// column 2: plugin short name
@@ -326,12 +323,12 @@ public: // some plugins could be just loaded by Plugin Updater, load them first
for (auto &it : arPluginList)
- if (!it->bWasLoaded && it->bWasChecked && !it->hInst)
+ if (!it->bWasLoaded && !it->bRequiresRestart && it->bWasChecked && !it->hInst)
LoadPluginDynamically(it);
// set checkboxes for all loaded plugins
for (auto &it : arPluginList)
- if (it->bWasChecked && isPluginOnWhiteList(it->fileName) && it->hInst)
+ if (isPluginOnWhiteList(it->fileName) && it->hInst)
m_plugList.SetItemState(it->iRow, 0x2000, LVIS_STATEIMAGEMASK);
// sort out the headers
|