summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-08-31 00:49:35 (GMT)
committerTobias Markmann <tm@ayena.de>2013-08-31 00:49:35 (GMT)
commit36de32c1a64fb814db18cafc7646feff144b5dbe (patch)
tree666382b18cb3f2892f48b79f19af88c12fcca07c /Swift
parent6477527df4a597d52f4d11ed554f43fb05566bfe (diff)
downloadswift-36de32c1a64fb814db18cafc7646feff144b5dbe.zip
swift-36de32c1a64fb814db18cafc7646feff144b5dbe.tar.bz2
Honour user's no encryption decision in manual configuration for non-eagle mode.
Change-Id: I7b5a2fb77b4a2239ee2c3d51939b21b4c0b17f50 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/MainController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 1ae175c..0d8793d 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -574,7 +574,7 @@ void MainController::performLoginFromCachedCredentials() {
ClientOptions clientOptions = clientOptions_;
bool eagle = settings_->getSetting(SettingConstants::FORGET_PASSWORDS);
clientOptions.forgetPassword = eagle;
- clientOptions.useTLS = eagle ? ClientOptions::RequireTLS : ClientOptions::UseTLSWhenAvailable;
+ clientOptions.useTLS = eagle ? ClientOptions::RequireTLS : clientOptions_.useTLS;
client_->connect(clientOptions);
}