From 1f093124cba611950c465933812736315a0f630b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 19 Jul 2023 15:23:41 +0300
Subject: =?UTF-8?q?fixes=20#3587=20(PluginUpdater:=20=D0=BD=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF=D1=83?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B9=20=D0=B1=D1=8D=D0=BA=D0=B0=D0=BF,=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0=20=D1=81=D1=83=D1=89=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D1=83=D1=8E=D1=89=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D1=8B=20=D0=BD=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D1=81=D1=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/PluginUpdater/src/DlgListNew.cpp | 10 +++++++++-
 plugins/PluginUpdater/src/DlgUpdate.cpp  |  3 +--
 plugins/PluginUpdater/src/version.h      |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp
index f406d96b3b..44fa701c89 100644
--- a/plugins/PluginUpdater/src/DlgListNew.cpp
+++ b/plugins/PluginUpdater/src/DlgListNew.cpp
@@ -324,7 +324,15 @@ public:
 		}
 		Netlib_CloseHandle(nlc);
 
-		RemoveBackupFolders();
+		int iFileCount = 0; // considering files . & ..
+		for (auto &it : MFilePath(wszBackupFolder).search())
+			if (mir_wstrcmp(it.getPath(), L".") && mir_wstrcmp(it.getPath(), L".."))
+				iFileCount++;
+
+		if (iFileCount == 0)
+			PU::SafeDeleteDirectory(wszBackupFolder);
+		else
+			RemoveBackupFolders();
 
 		ShowPopup(TranslateT("Plugin Updater"), TranslateT("Download complete"), POPUP_TYPE_INFO);
 
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 9a13d78737..d93f499a7a 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -618,8 +618,7 @@ static int ScanFolder(const wchar_t *pwszFolder, size_t cbBaseLen, const wchar_t
 
 	int count = 0;
 
-	MFilePath wszBuf;
-	wszBuf.Format(L"%s\\*", pwszFolder);
+	MFilePath wszBuf(pwszFolder);
 	for (auto &ff: wszBuf.search()) {
 		TFileName wszNewName;
 
diff --git a/plugins/PluginUpdater/src/version.h b/plugins/PluginUpdater/src/version.h
index fbfd07b5cd..8269e41d35 100644
--- a/plugins/PluginUpdater/src/version.h
+++ b/plugins/PluginUpdater/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION           0
 #define __MINOR_VERSION           2
 #define __RELEASE_NUM             1
-#define __BUILD_NUM               5
+#define __BUILD_NUM               6
 
 #include <stdver.h>
 
-- 
cgit v1.2.3