commit 444082f90f05f047e3e9a0287037f45822d46046 parent 1fbbd5d65ddca3193ef2842def983ba1df380e53 Author: ThomasV <electrumdev@gmail.com> Date: Fri, 12 Jun 2015 10:32:43 +0200 Merge pull request #1291 from kyuupichan/server_height_zero Show Synchronizing... when server height is zero Diffstat:
M | gui/qt/main_window.py | | | 8 | ++++++-- |
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py @@ -511,8 +511,12 @@ class ElectrumWindow(QMainWindow): icon = QIcon(":icons/status_disconnected.png") elif self.network.is_connected(): - server_lag = self.network.get_local_height() - self.network.get_server_height() - if not self.wallet.up_to_date: + server_height = self.network.get_server_height() + server_lag = self.network.get_local_height() - server_height + # Server height can be 0 after switching to a new server + # until we get a headers subscription request response. + # Display the synchronizing message in that case. + if not self.wallet.up_to_date or server_height == 0: text = _("Synchronizing...") icon = QIcon(":icons/status_waiting.png") elif server_lag > 1: