Skip to content

Commit

Permalink
Set up VFS integration before parsing options
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabian Müller committed Feb 19, 2022
1 parent 836fc7e commit c1ac176
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions src/gui/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,26 @@ 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";

if (_quitInstance) {
QTimer::singleShot(0, qApp, &QApplication::quit);
return;
}

parseOptions(arguments());

if (isRunning())
Expand Down Expand Up @@ -276,26 +296,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;
}

_folderManager.reset(new FolderMan);

connect(this, &SharedTools::QtSingleApplication::messageReceived, this, &Application::slotParseMessage);
Expand Down

0 comments on commit c1ac176

Please sign in to comment.