From 47b1febe15092532fec41ebf077eccd9a2e45484 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Thu, 26 Apr 2012 10:28:33 +0100
Subject: Force signouts after trust checking overides  when the password is
 unavailable.

Resolves: #1026

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();
 		}
-- 
cgit v0.10.2-6-g49f6