From 0b7160fb2ae9797b78050479544cdd55f06cdf43 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Aug 2020 22:35:21 +0300 Subject: Plugin Updater: if a file doesn't exist, it shoudn't generate an error too --- plugins/PluginUpdater/pu_stub/src/pu_stub.cpp | 1 + plugins/PluginUpdater/src/Utils.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'plugins/PluginUpdater') diff --git a/plugins/PluginUpdater/pu_stub/src/pu_stub.cpp b/plugins/PluginUpdater/pu_stub/src/pu_stub.cpp index f93a07484d..60c67f7c1a 100644 --- a/plugins/PluginUpdater/pu_stub/src/pu_stub.cpp +++ b/plugins/PluginUpdater/pu_stub/src/pu_stub.cpp @@ -95,6 +95,7 @@ int APIENTRY wWinMain(HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR lpCmdLine, int) if (!MoveFileW(ptszFile1, ptszFile2)) { // use copy on error switch (DWORD err = GetLastError()) { case ERROR_ALREADY_EXISTS: + case ERROR_FILE_NOT_FOUND: dwError = 0; break; // this file was included into many archives, so Miranda tries to move it again & again diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 33acef4b87..dcb7fcb2c0 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -490,6 +490,7 @@ int SafeMoveFile(const wchar_t *pSrc, const wchar_t *pDst) if (!MoveFileW(pSrc, pDst)) { // use copy on error switch (DWORD dwError = GetLastError()) { case ERROR_ALREADY_EXISTS: + case ERROR_FILE_NOT_FOUND: return 0; // this file was included into many archives, so Miranda tries to move it again & again case ERROR_ACCESS_DENIED: -- cgit v1.2.3