AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: handle UserCancelled when initializing swapmanager and requesting swap invoice

Browse Source 
when sending change to lightning
This commit is contained in:
Sander van Grieken
2025-03-25 11:48:24 +01:00
parent 67171af4a5
commit f7c1b203b2
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1228,6 +1228,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
return return
try: try:
self.run_coroutine_dialog(wait_until_initialized(), _('Please wait...')) self.run_coroutine_dialog(wait_until_initialized(), _('Please wait...'))
except UserCancelled:
return False
except Exception as e: except Exception as e:
self.show_error(str(e)) self.show_error(str(e))
return False return False

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

@@ -345,6 +345,8 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
except SwapServerError as e: except SwapServerError as e:
self.show_error(str(e)) self.show_error(str(e))
return return
except UserCancelled:
return
tx.replace_output_address(DummyAddress.SWAP, swap.lockup_address) tx.replace_output_address(DummyAddress.SWAP, swap.lockup_address)
assert tx.get_dummy_output(DummyAddress.SWAP) is None assert tx.get_dummy_output(DummyAddress.SWAP) is None
tx.swap_invoice = invoice tx.swap_invoice = invoice