Ensure file provider instance gets initialised at app launch WITHOUT creating a separ...

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 083f58a978b09d86dc6410a0ca8d3274b8ee5354..6fdfb07ff9b1b667cd00fba04d0343981a9d85a3 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -461,7 +461,7 @@ Application::Application(int &argc, char **argv)
     AccountSetupCommandLineManager::destroy();
 
 #if defined(BUILD_FILE_PROVIDER_MODULE)
-    _fileProvider.reset(new Mac::FileProvider);
+    Mac::FileProvider::instance();
 #endif
 }
 

diff --git a/src/gui/application.h b/src/gui/application.h
index 879ae51efede4a6cf2ebd528420dc206211579fb..9ec6e121bda397460523c9c4bd02b78542779c53 100644 (file)
--- a/src/gui/application.h
+++ b/src/gui/application.h
@@ -49,12 +49,6 @@ class Folder;
 class ShellExtensionsServer;
 class SslErrorDialog;
 
-#ifdef Q_OS_MACOS
-namespace Mac {
-class FileProvider;
-}
-#endif
-
 /**
  * @brief The Application class
  * @ingroup gui
@@ -163,8 +157,6 @@ private:
     QScopedPointer<FolderMan> _folderManager;
 #if defined(Q_OS_WIN)
     QScopedPointer<ShellExtensionsServer> _shellExtensionsServer;
-#elif defined(Q_OS_MACOS)
-    QScopedPointer<Mac::FileProvider> _fileProvider;
 #endif
 };