From: Christian Kamm <mail@ckamm.de>
Date: Tue, 8 Jan 2019 08:28:40 +0000 (+0100)
Subject: vfs: Don't assume suffix mode for old folders
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~340
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=47e21bfc60eb6c972a312d91cbed9a76b99c4800;p=nextcloud-desktop.git

vfs: Don't assume suffix mode for old folders

That would break with old folders that use selective sync.
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 46d65b982..7f7bc4110 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1277,16 +1277,19 @@ bool FolderDefinition::load(QSettings &settings, const QString &alias,
     folder->ignoreHiddenFiles = settings.value(QLatin1String("ignoreHiddenFiles"), QVariant(true)).toBool();
     folder->navigationPaneClsid = settings.value(QLatin1String("navigationPaneClsid")).toUuid();
 
-    folder->virtualFilesMode = Vfs::WithSuffix;
+    folder->virtualFilesMode = Vfs::Off;
     QString vfsModeString = settings.value(QStringLiteral("virtualFilesMode")).toString();
     if (!vfsModeString.isEmpty()) {
         if (auto mode = Vfs::modeFromString(vfsModeString)) {
             folder->virtualFilesMode = *mode;
         } else {
-            qCWarning(lcFolder) << "Unknown virtualFilesMode:" << vfsModeString << "assuming 'suffix'";
+            qCWarning(lcFolder) << "Unknown virtualFilesMode:" << vfsModeString << "assuming 'off'";
         }
     } else {
-        folder->upgradeVfsMode = true;
+        if (settings.value(QLatin1String("usePlaceholders")).toBool()) {
+            folder->virtualFilesMode = Vfs::WithSuffix;
+            folder->upgradeVfsMode = true; // maybe winvfs is available?
+        }
     }
 
     // Old settings can contain paths with native separators. In the rest of the