electrum

commit b88fa2046c9263cfee4d94d695addda356c1a42e
parent 2951ed5e17dbd4d96a2f03093dd46caee4393298
Author: ThomasV <thomasv@electrum.org>
Date:   Sat,  9 Dec 2017 07:07:33 +0100

Merge pull request #3478 from SomberNight/fix_payto_alias_blocking_gui_1

fix: openalias resolution unnecessarily done for some payto
Diffstat:
M
gui/qt/main_window.py
 | 
1
+
M
gui/qt/paytoedit.py
 | 
3
+++

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -606,6 +606,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
             self.need_update.clear()
             self.update_wallet()
         # resolve aliases
+        # FIXME this is a blocking network call that has a timeout of 5 sec
         self.payto_e.resolve()
         # update fee
         if self.require_fee_update:
diff --git a/gui/qt/paytoedit.py b/gui/qt/paytoedit.py
@@ -278,6 +278,9 @@ class PayToEdit(ScanQRTextEdit):
         self.previous_payto = key
         if not (('.' in key) and (not '<' in key) and (not ' ' in key)):
             return
+        parts = key.split(sep=',')  # assuming single line
+        if parts and len(parts) > 0 and bitcoin.is_address(parts[0]):
+            return
         try:
             data = self.win.contacts.resolve(key)
         except: