Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/5'
Browse files Browse the repository at this point in the history
  • Loading branch information
TheOneRing committed Nov 9, 2023
2 parents a971843 + 803897e commit 8ee07cd
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/gui/folder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,20 +164,6 @@ Folder::Folder(const FolderDefinition &definition,

// Potentially upgrade suffix vfs to windows vfs
OC_ENFORCE(_vfs);
if (_definition.virtualFilesMode == Vfs::WithSuffix
&& _definition.upgradeVfsMode) {
if (VfsPluginManager::instance().isVfsPluginAvailable(Vfs::WindowsCfApi)) {
if (auto winvfs = VfsPluginManager::instance().createVfsFromPlugin(Vfs::WindowsCfApi)) {
// Wipe the existing suffix files from fs and journal
_vfs->wipeDehydratedVirtualFiles();

// Then switch to winvfs mode
_vfs.reset(winvfs.release());
_definition.virtualFilesMode = Vfs::WindowsCfApi;
}
}
saveToSettings();
}
// Initialize the vfs plugin
startVfs();
}
Expand Down

0 comments on commit 8ee07cd

Please sign in to comment.