summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-04-26 09:28:33 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-04-26 09:28:33 (GMT)
commit47b1febe15092532fec41ebf077eccd9a2e45484 (patch)
treed89f481373d848f90ee004497869dad8771d4ad3 /Swift/Controllers/MainController.cpp
parent04965ae43dd4e6ce87206695f33bd4a7d5b3cbfd (diff)
downloadswift-contrib-47b1febe15092532fec41ebf077eccd9a2e45484.zip
swift-contrib-47b1febe15092532fec41ebf077eccd9a2e45484.tar.bz2
Force signouts after trust checking overides when the password is unavailable.
Resolves: #1026
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
-rw-r--r--Swift/Controllers/MainController.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 28fdb2b..f250205 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -565,6 +565,12 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro
}
}
+ if (forceReconnectAfterCertificateTrust && settings_->getSetting(SettingConstants::FORGET_PASSWORDS)) {
+ forceReconnectAfterCertificateTrust = false;
+ forceSignout = true;
+ message = QT_TRANSLATE_NOOP("", "Re-enter credentials and retry");
+ }
+
if (forceReconnectAfterCertificateTrust) {
performLoginFromCachedCredentials();
}