tcorrectly handle bitcoin URIs if GUI is already running - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 361ffc062053436f4625dbe54a6dd22d7adc8af7
DIR parent 0e6160bf2d66a0590df034c426d88ffa68bf9af3
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 25 Oct 2018 00:18:14 +0200
correctly handle bitcoin URIs if GUI is already running
see #4796
Diffstat:
M electrum/daemon.py | 1 +
M electrum/gui/qt/__init__.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
---
DIR diff --git a/electrum/daemon.py b/electrum/daemon.py
t@@ -221,6 +221,7 @@ class Daemon(DaemonThread):
config = SimpleConfig(config_options)
if self.gui:
if hasattr(self.gui, 'new_window'):
+ config.open_last_wallet()
path = config.get_wallet_path()
self.gui.new_window(path, config.get('url'))
response = "ok"
DIR diff --git a/electrum/gui/qt/__init__.py b/electrum/gui/qt/__init__.py
t@@ -237,9 +237,9 @@ class ElectrumGui(PrintError):
try:
for w in self.windows:
if w.wallet.storage.path == wallet.storage.path:
- w.bring_to_top()
- return
- w = self.create_window_for_wallet(wallet)
+ break
+ else:
+ w = self.create_window_for_wallet(wallet)
except BaseException as e:
traceback.print_exc(file=sys.stdout)
d = QMessageBox(QMessageBox.Warning, _('Error'),