From a3c013d6d824956dccebaac66c708f8c0a855167 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Jan 2020 19:56:48 +0300 Subject: =?UTF-8?q?fixes=20#2185=20(Clist=5Fmodern=20=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F,=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9,=20=D1=85=D0=BE=D1=82=D1=8F=20=D0=BE?= =?UTF-8?q?=D0=BD=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B5=D0=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/pluginopts.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/mir_app') 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 -- cgit v1.2.3