From 0e59bc1bc589222d00d53de3e2220ec06784a421 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sun, 14 Oct 2018 04:23:10 +0200 Subject: [PATCH] network: "switch unwanted fork" should check what fork we are on.. follow-up #4767 --- electrum/network.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/electrum/network.py b/electrum/network.py index 78d43481d..3e14b5fce 100644 --- a/electrum/network.py +++ b/electrum/network.py @@ -533,13 +533,15 @@ class Network(PrintError): """If auto_connect and main interface is not on preferred fork, try to switch to preferred fork. """ - if not self.auto_connect: + if not self.auto_connect or not self.interface: return with self.interfaces_lock: interfaces = list(self.interfaces.values()) # try to switch to preferred fork if self._blockchain_preferred_block: pref_height = self._blockchain_preferred_block['height'] pref_hash = self._blockchain_preferred_block['hash'] + if self.interface.blockchain.check_hash(pref_height, pref_hash): + return # already on preferred fork filtered = list(filter(lambda iface: iface.blockchain.check_hash(pref_height, pref_hash), interfaces)) if filtered: