Prevent downgrade of vfs folder #9119

TheOneRing · 2021-10-05T09:47:04Z

erikjv · 2021-10-06T08:22:25Z

src/gui/folder.cpp

@@ -1299,9 +1310,9 @@ void FolderDefinition::save(QSettings &settings, const FolderDefinition &folder)

    // Ensure new vfs modes won't be attempted by older clients
    if (folder.virtualFilesMode == Vfs::WindowsCfApi) {
-        settings.setValue(QLatin1String(versionC), 3);
+        settings.setValue(versionC(), 4);


shouldn't this call maxSettingsVersion()?

Hmm as you can see two lines later it doesn't always need to be the max version.
But I'll extract the two versions.

erikjv · 2021-10-06T08:23:00Z

src/gui/folderman.cpp

+ * [Accounts]
+ * 0\version=1
+ */
+auto versionC()


Isn't this a duplicate of the one in folder.cpp?

Both are version but in different section that are evaluated independently.
But yes...
However refactoring the settings stuff is stuff for a major release...

erikjv · 2021-10-06T08:24:20Z

src/gui/folderman.cpp

        if (foldersVersion <= maxFoldersVersion) {
            const auto &childGroups = settings->childGroups();
            for (const auto &folderAlias : childGroups) {
                settings->beginGroup(folderAlias);
-                const int folderVersion = settings->value(QLatin1String(versionC), 1).toInt();
+                const int folderVersion = settings->value(versionC(), 1).toInt();


1 is another magic number. Can you make constants somewhere in 1 place (in a header file?) and add some comments to them? I've now seen 1, 2, and 4. Oh, and there was a 3, but that's now "old"?