AaronFiore/electrum
1
0
Fork 0
Code Activity

qt main_window: move TaskThread from wallet.thread to window.thread

Browse Source
This commit is contained in:
SomberNight
2022-04-08 20:50:03 +02:00
parent 214ac19f15
commit 29c1106988
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,6 +205,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
Logger.__init__(self) Logger.__init__(self)
self._coroutines_scheduled = set() # type: Set[concurrent.futures.Future] self._coroutines_scheduled = set() # type: Set[concurrent.futures.Future]
self.thread = TaskThread(self, self.on_error)
self.tx_notification_queue = queue.Queue() self.tx_notification_queue = queue.Queue()
self.tx_notification_last_time = 0 self.tx_notification_last_time = 0
@@ -512,7 +513,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
@profiler @profiler
def load_wallet(self, wallet: Abstract_Wallet): def load_wallet(self, wallet: Abstract_Wallet):
wallet.thread = TaskThread(self, self.on_error)
self.update_recently_visited(wallet.storage.path) self.update_recently_visited(wallet.storage.path)
if wallet.has_lightning(): if wallet.has_lightning():
util.trigger_callback('channels_updated', wallet) util.trigger_callback('channels_updated', wallet)
@@ -2716,7 +2716,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
# (signature) wrapped C/C++ object has been deleted # (signature) wrapped C/C++ object has been deleted
pass pass
self.wallet.thread.add(task, on_success=show_signed_message) self.thread.add(task, on_success=show_signed_message)
def do_verify(self, address, message, signature): def do_verify(self, address, message, signature):
address = address.text().strip() address = address.text().strip()
@@ -2789,7 +2789,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
# (message_e) wrapped C/C++ object has been deleted # (message_e) wrapped C/C++ object has been deleted
pass pass
self.wallet.thread.add(task, on_success=setText) self.thread.add(task, on_success=setText)
def do_encrypt(self, message_e, pubkey_e, encrypted_e): def do_encrypt(self, message_e, pubkey_e, encrypted_e):
message = message_e.toPlainText() message = message_e.toPlainText()
@@ -3241,9 +3241,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
if self._cleaned_up: if self._cleaned_up:
return return
self._cleaned_up = True self._cleaned_up = True
if self.wallet.thread: if self.thread:
self.wallet.thread.stop() self.thread.stop()
self.wallet.thread = None self.thread = None
for fut in self._coroutines_scheduled: for fut in self._coroutines_scheduled:
fut.cancel() fut.cancel()
util.unregister_callback(self.on_network) util.unregister_callback(self.on_network)