@@ -247,6 +247,26 @@ Application::Application(int &argc, char **argv)
247
247
// needed during commandline options parsing
248
248
setApplicationVersion (_theme->versionSwitchOutput ());
249
249
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
+
265
+ if (_quitInstance) {
266
+ QTimer::singleShot (0 , qApp, &QApplication::quit);
267
+ return ;
268
+ }
269
+
250
270
parseOptions (arguments ());
251
271
252
272
if (isRunning ())
@@ -276,26 +296,6 @@ Application::Application(int &argc, char **argv)
276
296
if (!AbstractNetworkJob::httpTimeout)
277
297
AbstractNetworkJob::httpTimeout = cfg.timeout ();
278
298
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
-
294
- if (_quitInstance) {
295
- QTimer::singleShot (0 , qApp, &QApplication::quit);
296
- return ;
297
- }
298
-
299
299
_folderManager.reset (new FolderMan);
300
300
301
301
connect (this , &SharedTools::QtSingleApplication::messageReceived, this , &Application::slotParseMessage);
0 commit comments