mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-23 13:35:58 +03:00
Application: Initialize the folderman after we checked for existance
So we don't start the SocketAPI if we are going to quit. We also do not log any message anymore before we install the hooks Should solve #2666
This commit is contained in:
parent
94d0c28f69
commit
7671ae8df7
3 changed files with 4 additions and 2 deletions
|
@ -106,6 +106,8 @@ Application::Application(int &argc, char **argv) :
|
|||
setupLogging();
|
||||
setupTranslations();
|
||||
|
||||
_folderManager.reset(new FolderMan);
|
||||
|
||||
connect( this, SIGNAL(messageReceived(QString, QObject*)), SLOT(slotParseOptions(QString, QObject*)));
|
||||
|
||||
// Create the account info manager to ensure it's listening to the
|
||||
|
|
|
@ -107,7 +107,7 @@ private:
|
|||
|
||||
QTimer _checkConnectionTimer;
|
||||
|
||||
FolderMan folderManager;
|
||||
QScopedPointer<FolderMan> _folderManager;
|
||||
|
||||
friend class ownCloudGui; // for _startupNetworkError
|
||||
};
|
||||
|
|
|
@ -37,6 +37,7 @@ class FolderMan : public QObject
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
~FolderMan();
|
||||
static FolderMan* instance();
|
||||
|
||||
int setupFolders();
|
||||
|
@ -173,7 +174,6 @@ private:
|
|||
|
||||
static FolderMan *_instance;
|
||||
explicit FolderMan(QObject *parent = 0);
|
||||
~FolderMan();
|
||||
friend class OCC::Application;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue