Merge remote-tracking branch 'origin/2.10'

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index 26a5f703b..d1e30c876 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -298,10 +298,7 @@ void AccountState::checkConnectivity(bool blockJobs)
         // Use a small authed propfind as a minimal ping when we're
         // already connected.
         if (blockJobs) {
-            if (Theme::instance()->connectionValidatorClearCookies()) {
-                // clear the cookies directly before we try to validate
-                connect(_connectionValidator, &ConnectionValidator::aboutToStart, _account.get(), &Account::clearCookieJar, Qt::DirectConnection);
-            }
+            _connectionValidator->setClearCookies(true);
             _connectionValidator->checkServer();
         } else {
             _connectionValidator->checkServerAndUpdate();
@@ -322,6 +319,7 @@ void AccountState::checkConnectivity(bool blockJobs)
         // ssl config that does not have a sensible certificate chain.
         account()->setSslConfiguration(QSslConfiguration());
         //#endif
+        account()->clearCookieJar();
         _connectionValidator->checkServerAndUpdate();
     }
 }