Fix unit tests

2 files changed, 12 insertions, 2 deletions

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 86b0e5b70..a4cef5fb2 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -105,12 +105,16 @@ AccountState::AccountState(AccountPtr account)
         _state = State::SignedOut;
     });
 
-    FolderMan::instance()->socketApi()->registerAccount(account);
+    if (FolderMan::instance()) {
+        FolderMan::instance()->socketApi()->registerAccount(account);
+    }
 }
 
 AccountState::~AccountState()
 {
-    FolderMan::instance()->socketApi()->unregisterAccount(account());
+    if (FolderMan::instance()) {
+        FolderMan::instance()->socketApi()->unregisterAccount(account());
+    }
 }
 
 AccountStatePtr AccountState::loadFromSettings(AccountPtr account, const QSettings &settings)
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 9b9e50af5..3ec1ce778 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -88,6 +88,12 @@ public:
     static bool prepareFolder(const QString &folder);
 
     ~FolderMan() override;
+
+    /**
+     * Helper to access the FolderMan instance
+     * Warning: may be null in unit tests
+     */
+    // TODO: use acces throug ocApp and remove that instance pointer
     static FolderMan *instance();
 
     int setupFolders();