AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: extend self._loading guard to encompass _on_backend_wallet_loaded slot as well

Browse Source
This commit is contained in:
Sander van Grieken
2024-02-05 17:56:02 +01:00
parent b361d02467
commit 5aa782a19e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/gui/qml/qedaemon.py
View File

@@ -201,6 +201,7 @@ class QEDaemon(AuthMixin, QObject):
wallet_already_open_password = QEWallet.getInstanceFor(wallet_already_open).password wallet_already_open_password = QEWallet.getInstanceFor(wallet_already_open).password
def load_wallet_task(): def load_wallet_task():
success = False
try: try:
local_password = password # need this in local scope local_password = password # need this in local scope
wallet = None wallet = None
@@ -237,10 +238,12 @@ class QEDaemon(AuthMixin, QObject):
run_hook('load_wallet', wallet) run_hook('load_wallet', wallet)
success = True
self._backendWalletLoaded.emit(local_password) self._backendWalletLoaded.emit(local_password)
finally: finally:
self._loading = False if not success: # if successful, _loading guard will be reset by _on_backend_wallet_loaded
self.loadingChanged.emit() self._loading = False
self.loadingChanged.emit()
threading.Thread(target=load_wallet_task, daemon=False).start() threading.Thread(target=load_wallet_task, daemon=False).start()
@@ -253,6 +256,8 @@ class QEDaemon(AuthMixin, QObject):
self._current_wallet = QEWallet.getInstanceFor(wallet) self._current_wallet = QEWallet.getInstanceFor(wallet)
self.availableWallets.updateWallet(self._path) self.availableWallets.updateWallet(self._path)
self._current_wallet.password = password if password else None self._current_wallet.password = password if password else None
self._loading = False
self.loadingChanged.emit()
self.walletLoaded.emit(self._name, self._path) self.walletLoaded.emit(self._name, self._path)
@pyqtSlot(QEWallet) @pyqtSlot(QEWallet)