From 36de32c1a64fb814db18cafc7646feff144b5dbe Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sat, 31 Aug 2013 02:49:35 +0200
Subject: 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.

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