jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI/updater: Fix silent failure on auto-update

master
jp9000 2022-08-31 20:19:05 -07:00
parent 31414d2d7a
commit e87a97eb8c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
UI/win-update/updater/updater.cpp
View File

@ -798,9 +798,12 @@ static void AddPackageRemovedFiles(const Json &package)
/* Technically GetFileAttributes can fail for other reasons,
* so double-check by also checking the last error */
if (GetFileAttributesW(removedFileName) ==
INVALID_FILE_ATTRIBUTES &&
GetLastError() == ERROR_FILE_NOT_FOUND)
continue;
INVALID_FILE_ATTRIBUTES) {
int err = GetLastError();
if (err == ERROR_FILE_NOT_FOUND ||
err == ERROR_PATH_NOT_FOUND)
continue;
}
deletion_t deletion;
deletion.originalFilename = removedFileName;
@ -1577,9 +1580,13 @@ static bool Update(wchar_t *cmdLine)
}
}
for (deletion_t &deletion : deletions)
if (!RenameRemovedFile(deletion))
for (deletion_t &deletion : deletions) {
if (!RenameRemovedFile(deletion)) {
Status(L"Update failed: Couldn't remove "
L"obsolete files");
return false;
}
}
/* ------------------------------------- *
* Install virtual camera */