From e77b52e708b9a624325bf2cdf9f34536c6492de3 Mon Sep 17 00:00:00 2001
From: alex-z <blackslayer4@gmail.com>
Date: Tue, 14 Nov 2023 19:18:01 +0100
Subject: [PATCH] VFS. Properly set Folders/WithPlaceholders in config when
 switching modes. Refactoring.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---
 src/gui/folder.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index dc37d71d18893..21f3423460326 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -767,11 +767,11 @@ void Folder::implicitlyHydrateFile(const QString &relativepath)
 
 void Folder::setVirtualFilesEnabled(bool enabled)
 {
-    Vfs::Mode newMode = _definition.virtualFilesMode;
-    if (enabled && _definition.virtualFilesMode == Vfs::Off) {
-        newMode = bestAvailableVfsMode();
-    } else if (!enabled && _definition.virtualFilesMode != Vfs::Off) {
+    auto newMode = _definition.virtualFilesMode;
+    if (!enabled) {
         newMode = Vfs::Off;
+    } else if (newMode == Vfs::Off) {
+        newMode = bestAvailableVfsMode();
     }
 
     if (newMode != _definition.virtualFilesMode) {
@@ -788,8 +788,8 @@ void Folder::setVirtualFilesEnabled(bool enabled)
 
         _definition.virtualFilesMode = newMode;
         startVfs();
+        _saveInFoldersWithPlaceholders = newMode != Vfs::Off;
         if (newMode != Vfs::Off) {
-            _saveInFoldersWithPlaceholders = true;
             switchToVirtualFiles();
         }
         saveToSettings();