Ensure cookies are cleared right before the server check

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 05f92dfa6..46b89d810 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -21,6 +21,7 @@
 #include "logger.h"
 #include "configfile.h"
 #include "settingsdialog.h"
+#include "theme.h"
 
 #include <QMessageBox>
 #include <QSettings>
@@ -262,7 +263,6 @@ void AccountState::checkConnectivity(bool verifyServerState)
     }
 
     if (verifyServerState) {
-        _account->clearCookieJar();
         _queueGuard.block();
     }
     ConnectionValidator *conValidator = new ConnectionValidator(account());
@@ -273,6 +273,10 @@ void AccountState::checkConnectivity(bool verifyServerState)
         // Use a small authed propfind as a minimal ping when we're
         // already connected.
         if (verifyServerState) {
+            if (Theme::instance()->connectionValidatorClearCookies()) {
+                // clear the cookies directly before we try to validate
+                connect(conValidator, &ConnectionValidator::aboutToStart, _account.get(), &Account::clearCookieJar, Qt::DirectConnection);
+            }
             conValidator->checkServer();
         } else {
             conValidator->checkServerAndUpdate();