AaronFiore/electrum
1
0
Fork 0
Code Activity

do not block load_wallet with watching_only warning

Browse Source
This commit is contained in:
ThomasV
2018-12-04 11:52:31 +01:00
parent 5ae9365f77
commit bd5c82404d
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qt/__init__.py
View File

@@ -191,13 +191,13 @@ class ElectrumGui(PrintError):
self.network_updated_signal_obj) self.network_updated_signal_obj)
self.nd.show() self.nd.show()
@profiler
def create_window_for_wallet(self, wallet): def create_window_for_wallet(self, wallet):
w = ElectrumWindow(self, wallet) w = ElectrumWindow(self, wallet)
self.windows.append(w) self.windows.append(w)
self.build_tray_menu() self.build_tray_menu()
# FIXME: Remove in favour of the load_wallet hook # FIXME: Remove in favour of the load_wallet hook
run_hook('on_new_window', w) run_hook('on_new_window', w)
w.warn_if_watching_only()
return w return w
def count_wizards_in_progress(func): def count_wizards_in_progress(func):

1
electrum/gui/qt/main_window.py
View File

@@ -413,7 +413,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.wallet.basename()) self.wallet.basename())
extra = [self.wallet.storage.get('wallet_type', '?')] extra = [self.wallet.storage.get('wallet_type', '?')]
if self.wallet.is_watching_only(): if self.wallet.is_watching_only():
self.warn_if_watching_only()
extra.append(_('watching only')) extra.append(_('watching only'))
title += ' [%s]'% ', '.join(extra) title += ' [%s]'% ', '.join(extra)
self.setWindowTitle(title) self.setWindowTitle(title)