commit 19d4bd4837ae1ebb59ad9ea325897e43e8cc12c6
parent 4e0d1799375ec23cb4b453e569f7db95ef1fe765
Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 11 Sep 2018 18:28:59 +0200
simplify prev
Diffstat:
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py
@@ -125,7 +125,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.tx_notification_queue = queue.Queue()
self.tx_notification_last_time = 0
- self.tx_notification_event = threading.Event()
self.create_status_bar()
self.need_update = threading.Event()
@@ -304,7 +303,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
# FIXME maybe this event should also include which wallet
# the tx is for. now all wallets get this.
self.tx_notification_queue.put(args[0])
- self.tx_notification_event.set()
elif event in ['status', 'banner', 'verified', 'fee']:
# Handle in GUI thread
self.network_signal.emit(event, args)
@@ -593,12 +591,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
# note: during initial history sync for a wallet, many txns will be
# received multiple times. hence the "total amount received" will be
# a lot higher than should be. this is expected though not intended
- if not self.tx_notification_event.is_set():
+ if self.tx_notification_queue.qsize() == 0:
return
now = time.time()
if self.tx_notification_last_time + 5 > now:
return
- self.tx_notification_event.clear()
self.tx_notification_last_time = now
self.print_error("Notifying GUI about new transactions")
txns = []