Merge pull request #3478 from SomberNight/fix_payto_alias_blocking_gui_1

fix: openalias resolution unnecessarily done for some payto
This commit is contained in:
ThomasV 2017-12-09 07:07:33 +01:00 committed by GitHub
commit b88fa2046c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -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:

View File

@ -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: