electrum

commit 427779350f92c4fd19d731474db3ec0db1d848c1
parent c46fbf08a525988f1a2f175906e00f084426c4ab
Author: ThomasV <thomasv@electrum.org>
Date:   Sun, 29 Nov 2020 11:43:33 +0100

Trustedcoin: call wizard.terminate with aborted set to True in various failure conditions (see #4496)

Diffstat:
M
electrum/plugins/trustedcoin/kivy.py
 | 
2
+-
M
electrum/plugins/trustedcoin/trustedcoin.py
 | 
6
+++---

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/electrum/plugins/trustedcoin/kivy.py b/electrum/plugins/trustedcoin/kivy.py
@@ -75,7 +75,7 @@ class Plugin(TrustedCoinPlugin):
     def accept_terms_of_use(self, wizard):
         def handle_error(msg, e):
             wizard.show_error(msg + ':\n' + repr(e))
-            wizard.terminate()
+            wizard.terminate(aborted=True)
         try:
             tos = server.get_terms_of_service()
         except ErrorConnectingServer as e:
diff --git a/electrum/plugins/trustedcoin/trustedcoin.py b/electrum/plugins/trustedcoin/trustedcoin.py
@@ -671,7 +671,7 @@ class TrustedCoinPlugin(BasePlugin):
             r = server.create(xpub1, xpub2, email)
         except (socket.error, ErrorConnectingServer):
             wizard.show_message('Server not reachable, aborting')
-            wizard.terminate()
+            wizard.terminate(aborted=True)
             return
         except TrustedCoinException as e:
             if e.status_code == 409:
@@ -721,10 +721,10 @@ class TrustedCoinPlugin(BasePlugin):
                 self.request_otp_dialog(wizard, short_id, None, xpub3)
             else:
                 wizard.show_message(str(e))
-                wizard.terminate()
+                wizard.terminate(aborted=True)
         except Exception as e:
             wizard.show_message(repr(e))
-            wizard.terminate()
+            wizard.terminate(aborted=True)
         else:
             k3 = keystore.from_xpub(xpub3)
             wizard.data['x3/'] = k3.dump()