Ensure the folder definition is initialised

1 files changed, 16 insertions, 17 deletions

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 1692f6bd8..3f3f75fed 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1365,33 +1365,32 @@ void FolderDefinition::save(QSettings &settings, const FolderDefinition &folder)
         settings.remove(QLatin1String("navigationPaneClsid"));
 }
 
-bool FolderDefinition::load(QSettings &settings, const QString &alias,
-    FolderDefinition *folder)
-{
-    folder->alias = FolderMan::unescapeAlias(alias);
-    folder->setLocalPath(settings.value(QLatin1String("localPath")).toString());
-    folder->journalPath = settings.value(QLatin1String("journalPath")).toString();
-    folder->setTargetPath(settings.value(QLatin1String("targetPath")).toString());
-    folder->_webDavUrl = settings.value(davUrlC()).toUrl();
-    folder->paused = settings.value(QLatin1String("paused")).toBool();
-    folder->ignoreHiddenFiles = settings.value(QLatin1String("ignoreHiddenFiles"), QVariant(true)).toBool();
-    folder->navigationPaneClsid = settings.value(QLatin1String("navigationPaneClsid")).toUuid();
-
-    folder->virtualFilesMode = Vfs::Off;
+FolderDefinition FolderDefinition::load(QSettings &settings, const QString &alias)
+{
+    FolderDefinition folder(settings.value(davUrlC()).toUrl());
+    folder.alias = FolderMan::unescapeAlias(alias);
+    folder.setLocalPath(settings.value(QLatin1String("localPath")).toString());
+    folder.journalPath = settings.value(QLatin1String("journalPath")).toString();
+    folder.setTargetPath(settings.value(QLatin1String("targetPath")).toString());
+    folder.paused = settings.value(QLatin1String("paused")).toBool();
+    folder.ignoreHiddenFiles = settings.value(QLatin1String("ignoreHiddenFiles"), QVariant(true)).toBool();
+    folder.navigationPaneClsid = settings.value(QLatin1String("navigationPaneClsid")).toUuid();
+
+    folder.virtualFilesMode = Vfs::Off;
     QString vfsModeString = settings.value(QStringLiteral("virtualFilesMode")).toString();
     if (!vfsModeString.isEmpty()) {
         if (auto mode = Vfs::modeFromString(vfsModeString)) {
-            folder->virtualFilesMode = *mode;
+            folder.virtualFilesMode = *mode;
         } else {
             qCWarning(lcFolder) << "Unknown virtualFilesMode:" << vfsModeString << "assuming 'off'";
         }
     } else {
         if (settings.value(QLatin1String("usePlaceholders")).toBool()) {
-            folder->virtualFilesMode = Vfs::WithSuffix;
-            folder->upgradeVfsMode = true; // maybe winvfs is available?
+            folder.virtualFilesMode = Vfs::WithSuffix;
+            folder.upgradeVfsMode = true; // maybe winvfs is available?
         }
     }
-    return true;
+    return folder;
 }
 
 void FolderDefinition::setLocalPath(const QString &path)