From bf223470ce607a762700f144a6a0f4cb0205cf54 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 25 Apr 2020 06:53:25 +0200 Subject: [PATCH] network: handle unparseable server-str follow-up 9e57ae630ba96e6d2c40288d2633aeca8d20764d fixes #6113 --- electrum/gui/kivy/main_window.py | 1 + electrum/gui/qt/network_dialog.py | 1 + 2 files changed, 2 insertions(+) diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py index 63ea82eee..7793a034f 100644 --- a/electrum/gui/kivy/main_window.py +++ b/electrum/gui/kivy/main_window.py @@ -150,6 +150,7 @@ class ElectrumWindow(App): net_params = self.network.get_parameters() try: server = ServerAddr.from_str_with_inference(server_str) + if not server: raise Exception("failed to parse") except Exception as e: self.show_error(_("Invalid server details: {}").format(repr(e))) return diff --git a/electrum/gui/qt/network_dialog.py b/electrum/gui/qt/network_dialog.py index 1473792df..8aed26ea5 100644 --- a/electrum/gui/qt/network_dialog.py +++ b/electrum/gui/qt/network_dialog.py @@ -428,6 +428,7 @@ class NetworkChoiceLayout(object): net_params = self.network.get_parameters() try: server = ServerAddr.from_str_with_inference(str(self.server_e.text())) + if not server: raise Exception("failed to parse") except Exception: return net_params = net_params._replace(server=server,