Ensure file provider instance gets initialised at app launch WITHOUT …

…creating a separate instance from expected singleton Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Jul 22, 2024 · 8fc5849 · 8fc5849
1 parent 46c0af7
commit 8fc5849
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -456,7 +456,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
@@ -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 @@ protected slots:
     QScopedPointer<FolderMan> _folderManager;
 #if defined(Q_OS_WIN)
     QScopedPointer<ShellExtensionsServer> _shellExtensionsServer;
-#elif defined(Q_OS_MACOS)
-    QScopedPointer<Mac::FileProvider> _fileProvider;
 #endif
 };