Merge pull request #3729 from RaiKoHoff/Dev_RC

On file restore, do not notify immediately, but check against stored file attributes.
This commit is contained in:
Rainer Kottenhoff 2021-10-21 13:36:30 +02:00 committed by GitHub
commit b03cdce9b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -558,17 +558,17 @@ static inline bool HasCurrentFileChanged() {
}
WIN32_FIND_DATA fdUpdated = { 0 };
if (!GetFileAttributesEx(Paths.CurrentFile, GetFileExInfoStandard, &fdUpdated)) {
// The current file has been removed
if (IsFileDeletedFlagSet()) {
return false;
} else {
SetEvent(s_hEventFileChangedExt);
SetEvent(s_hEventFileDeletedExt);
return true; // The current file has been removed
return true;
}
} else if (IsFileDeletedFlagSet()) {
SetEvent(s_hEventFileChangedExt);
// The current file has been restored
ResetEvent(s_hEventFileDeletedExt);
return true; // The current file has been restored
}
bool const changed = (s_fdCurFile.nFileSizeLow != fdUpdated.nFileSizeLow) || (s_fdCurFile.nFileSizeHigh != fdUpdated.nFileSizeHigh)