mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vfs: Fix folder dehydration requests on OSX #6977

Browse Source 
Since the rename is triggered by the client process the folder watcher
didn't pick up on it on OSX.

This does not need to be merged into master.
This commit is contained in:
Christian Kamm 2019-02-15 08:18:58 +01:00 committed by ckamm
parent 9e66347be0
commit 95e7720864
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/socketapi.cpp
View File

@ -665,13 +665,13 @@ void SocketApi::command_REPLACE_VIRTUAL_FILE(const QString &filesArg, SocketList
qCWarning(lcSocketApi) << "Unable to rename " << file;
}
});
continue;
}
SyncJournalFileRecord record;
if (!folder->journalDb()->getFileRecord(relativePath, &record) || !record.isValid())
continue;
if (!FileSystem::rename(file, file + suffix)) {
qCWarning(lcSocketApi) << "Unable to rename " << file;
} else {
SyncJournalFileRecord record;
if (!folder->journalDb()->getFileRecord(relativePath, &record) || !record.isValid())
continue;
if (!FileSystem::rename(file, file + suffix)) {
qCWarning(lcSocketApi) << "Unable to rename " << file;
}
}
folder->slotWatchedPathChanged(file); // make sure it is in the _localDiscoveryTracker list
FolderMan::instance()->scheduleFolder(folder);