Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set up VFS integration before parsing options #9457

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Set up VFS integration before parsing options #9457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/unreleased/9155
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
30 changes: 15 additions & 15 deletions src/gui/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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;
Expand Down