Set up VFS integration before parsing options

owncloud · Feb 22, 2022 · 898f447 · 898f447
1 parent 836fc7e
commit 898f447
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/changelog/unreleased/9155 b/changelog/unreleased/9155
@@ -0,0 +1,7 @@
+Bugfix: --version showed incorrect information about VFS support
+
+--version used to always show "Off", even when a VFS plugin was available.
+This has been fixed now.
+
+https://github.com/owncloud/client/issues/9155
+https://github.com/owncloud/client/pull/9457
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -247,6 +247,21 @@ Application::Application(int &argc, char **argv)
     // needed during commandline options parsing
     setApplicationVersion(_theme->versionSwitchOutput());
 
+#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX)
+    const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR));
+    qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir;
+    this->addLibraryPath(extraPluginDir);
+#endif
+
+    // Check vfs plugins
+    if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
+        qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";
+    }
+    if (isVfsPluginAvailable(Vfs::WindowsCfApi))
+        qCInfo(lcApplication) << "VFS windows plugin is available";
+    if (isVfsPluginAvailable(Vfs::WithSuffix))
+        qCInfo(lcApplication) << "VFS suffix plugin is available";
+
     parseOptions(arguments());
 
     if (isRunning())
@@ -276,21 +291,6 @@ Application::Application(int &argc, char **argv)
     if (!AbstractNetworkJob::httpTimeout)
         AbstractNetworkJob::httpTimeout = cfg.timeout();
 
-#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX)
-    const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR));
-    qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir;
-    this->addLibraryPath(extraPluginDir);
-#endif
-
-    // Check vfs plugins
-    if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
-        qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";
-    }
-    if (isVfsPluginAvailable(Vfs::WindowsCfApi))
-        qCInfo(lcApplication) << "VFS windows plugin is available";
-    if (isVfsPluginAvailable(Vfs::WithSuffix))
-        qCInfo(lcApplication) << "VFS suffix plugin is available";
-
     if (_quitInstance) {
         QTimer::singleShot(0, qApp, &QApplication::quit);
         return;