AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: destroy qeswaphelper with SwapDialog and catch RuntimeErrors if qeswalhelper members are accessed after

Browse Source
This commit is contained in:
Sander van Grieken
2023-04-12 16:09:37 +02:00
parent d6403400bc
commit d5ce9c0994
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/gui/qml/components/main.qml
View File

@@ -365,7 +365,10 @@ ApplicationWindow
Component { Component {
id: swapDialog id: swapDialog
SwapDialog { SwapDialog {
onClosed: destroy() onClosed: {
swaphelper.destroy()
destroy()
}
} }
} }

34
electrum/gui/qml/qeswaphelper.py
View File

@@ -359,12 +359,16 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
fut = asyncio.run_coroutine_threadsafe(coro, loop) fut = asyncio.run_coroutine_threadsafe(coro, loop)
self.swapStarted.emit() self.swapStarted.emit()
txid = fut.result() txid = fut.result()
self.swapSuccess.emit() try: # swaphelper might be destroyed at this point
self.swapSuccess.emit()
except RuntimeError:
pass
except Exception as e: except Exception as e:
self._logger.error(str(e)) try: # swaphelper might be destroyed at this point
self.swapFailed.emit(str(e)) self._logger.error(str(e))
finally: self.swapFailed.emit(str(e))
self.deleteLater() except RuntimeError:
pass
threading.Thread(target=swap_task, daemon=True).start() threading.Thread(target=swap_task, daemon=True).start()
@@ -383,15 +387,19 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
fut = asyncio.run_coroutine_threadsafe(coro, loop) fut = asyncio.run_coroutine_threadsafe(coro, loop)
self.swapStarted.emit() self.swapStarted.emit()
success = fut.result() success = fut.result()
if success: try: # swaphelper might be destroyed at this point
self.swapSuccess.emit() if success:
else: self.swapSuccess.emit()
self.swapFailed.emit('') else:
self.swapFailed.emit('')
except RuntimeError:
pass
except Exception as e: except Exception as e:
self._logger.error(str(e)) try: # swaphelper might be destroyed at this point
self.swapFailed.emit(str(e)) self._logger.error(str(e))
finally: self.swapFailed.emit(str(e))
self.deleteLater() except RuntimeError:
pass
threading.Thread(target=swap_task, daemon=True).start() threading.Thread(target=swap_task, daemon=True).start()