Browse Source
Merge pull request #3478 from SomberNight/fix_payto_alias_blocking_gui_1
fix: openalias resolution unnecessarily done for some payto
3.0.x
ThomasV
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
0 deletions
-
gui/qt/main_window.py
-
gui/qt/paytoedit.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: |
|
|
|
|
|
|
|
@ -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: |
|
|
|
|
