From 294ec4efc6142351842c75ca684df1e14e00d658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 31 May 2016 16:07:44 +0200
Subject: [PATCH] Catch QueryCanceled when running DBLogin

changeset bf55d0d38d01 moved the catch but missed that run() could raise this
exception if cancel button is clicked.
---
 tryton/gui/main.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 2b58049066..043d69ebb0 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -878,7 +878,12 @@ class Main(object):
         if not self.sig_logout(widget, disconnect=False):
             return
         language = CONFIG['client.lang']
-        host, port, database, username = DBLogin().run()
+        try:
+            host, port, database, username = DBLogin().run()
+        except TrytonError, exception:
+            if exception.faultCode == 'QueryCanceled':
+                return
+            raise
         func = lambda parameters: rpc.login(
             host, port, database, username, parameters, language)
         try: