Skip to content

Commit 14146c8

Browse files
Fabian MüllerTheOneRing
Fabian Müller
authored andcommittedFeb 28, 2022
Set up VFS integration before parsing options
1 parent 9767eda commit 14146c8

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed
 

‎changelog/unreleased/9155

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Bugfix: --version showed incorrect information about VFS support
2+
3+
--version used to always show "Off", even when a VFS plugin was available.
4+
This has been fixed now.
5+
6+
https://github.com/owncloud/client/issues/9155
7+
https://github.com/owncloud/client/pull/9457

‎src/gui/application.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,21 @@ Application::Application(int &argc, char **argv)
247247
// needed during commandline options parsing
248248
setApplicationVersion(_theme->versionSwitchOutput());
249249

250+
#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX)
251+
const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR));
252+
qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir;
253+
this->addLibraryPath(extraPluginDir);
254+
#endif
255+
256+
// Check vfs plugins
257+
if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
258+
qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";
259+
}
260+
if (isVfsPluginAvailable(Vfs::WindowsCfApi))
261+
qCInfo(lcApplication) << "VFS windows plugin is available";
262+
if (isVfsPluginAvailable(Vfs::WithSuffix))
263+
qCInfo(lcApplication) << "VFS suffix plugin is available";
264+
250265
parseOptions(arguments());
251266

252267
if (isRunning())
@@ -276,21 +291,6 @@ Application::Application(int &argc, char **argv)
276291
if (!AbstractNetworkJob::httpTimeout)
277292
AbstractNetworkJob::httpTimeout = cfg.timeout();
278293

279-
#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX)
280-
const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR));
281-
qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir;
282-
this->addLibraryPath(extraPluginDir);
283-
#endif
284-
285-
// Check vfs plugins
286-
if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
287-
qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";
288-
}
289-
if (isVfsPluginAvailable(Vfs::WindowsCfApi))
290-
qCInfo(lcApplication) << "VFS windows plugin is available";
291-
if (isVfsPluginAvailable(Vfs::WithSuffix))
292-
qCInfo(lcApplication) << "VFS suffix plugin is available";
293-
294294
if (_quitInstance) {
295295
QTimer::singleShot(0, qApp, &QApplication::quit);
296296
return;

0 commit comments

Comments
 (0)