summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMili Verma <mili.verma@isode.com>2015-06-23 13:27:08 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-06-29 14:52:08 (GMT)
commitac45f360be049242a89ae80258e4ea8350f909ba (patch)
tree3e3b5fb80edaaa867adfb7873550d934f0b60298 /Swift/Controllers
parentea41bd07a0e014c12cce144b421abac9f21d1269 (diff)
downloadswift-ac45f360be049242a89ae80258e4ea8350f909ba.zip
swift-ac45f360be049242a89ae80258e4ea8350f909ba.tar.bz2
Pass an optional error code
This patch creates and passes on an optional boost::system::error_code variable which contains more error info which can be displayed in case of an error. Test-information: Tested using WIP code on Windows. Change-Id: I285b8aec5e9c00d3a8e0d8cc0d5e7b4c5d94c099
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/MainController.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index c6b6dfc..95094f2 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -662,6 +662,10 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro
}
}
+ if (!message.empty() && error->getErrorCode()) {
+ message = str(format(QT_TRANSLATE_NOOP("", "%1% (%2%)")) % message % error->getErrorCode()->message());
+ }
+
if (forceReconnectAfterCertificateTrust && settings_->getSetting(SettingConstants::FORGET_PASSWORDS)) {
forceReconnectAfterCertificateTrust = false;
forceSignout = true;