AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: even more clean-up before exiting

Browse Source 
related: https://github.com/spesmilo/electrum/issues/6889#issuecomment-812776695
This commit is contained in:
SomberNight
2021-04-03 19:17:32 +02:00
parent e64aed2aec
commit 981381346f
2 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
electrum/gui/qt/__init__.py
View File

@@ -88,6 +88,10 @@ class QNetworkUpdatedSignalObject(QObject):
class ElectrumGui(Logger):
network_dialog: Optional['NetworkDialog']
lightning_dialog: Optional['LightningDialog']
watchtower_dialog: Optional['WatchtowerDialog']
@profiler
def __init__(self, config: 'SimpleConfig', daemon: 'Daemon', plugins: 'Plugins'):
set_language(config.get('language', get_default_language()))
@@ -111,6 +115,7 @@ class ElectrumGui(Logger):
self.app = QElectrumApplication(sys.argv)
self.app.installEventFilter(self.efilter)
self.app.setWindowIcon(read_QIcon("electrum.png"))
self._cleaned_up = False
# timer
self.timer = QTimer(self.app)
self.timer.setSingleShot(False)
@@ -199,15 +204,40 @@ class ElectrumGui(Logger):
for w in self.windows:
w.hide()
def close(self):
for window in self.windows:
def _cleanup_before_exit(self):
if self._cleaned_up:
return
self._cleaned_up = True
self.app.new_window_signal.disconnect()
self.efilter = None
# If there are still some open windows, try to clean them up.
for window in list(self.windows):
window.close()
window.clean_up()
if self.network_dialog:
self.network_dialog.close()
self.network_dialog.clean_up()
self.network_dialog = None
self.network_updated_signal_obj = None
if self.lightning_dialog:
self.lightning_dialog.close()
self.lightning_dialog = None
if self.watchtower_dialog:
self.watchtower_dialog.close()
self.watchtower_dialog = None
# Shut down the timer cleanly
self.timer.stop()
self.timer = None
# clipboard persistence. see http://www.mail-archive.com/pyqt@riverbankcomputing.com/msg17328.html
event = QtCore.QEvent(QtCore.QEvent.Clipboard)
self.app.sendEvent(self.app.clipboard(), event)
if self.tray:
self.tray.hide()
self.tray.deleteLater()
self.tray = None
def close(self):
self._cleanup_before_exit()
self.app.quit()
def new_window(self, path, uri=None):
@@ -232,8 +262,10 @@ class ElectrumGui(Logger):
self.network_dialog.show()
self.network_dialog.raise_()
return
self.network_dialog = NetworkDialog(self.daemon.network, self.config,
self.network_updated_signal_obj)
self.network_dialog = NetworkDialog(
network=self.daemon.network,
config=self.config,
network_updated_signal_obj=self.network_updated_signal_obj)
self.network_dialog.show()
def _create_window_for_wallet(self, wallet):
@@ -382,18 +414,7 @@ class ElectrumGui(Logger):
self.app.lastWindowClosed.connect(quit_after_last_window)
def clean_up():
# If there are still some open windows, try to clean them up.
for window in list(self.windows):
window.clean_up()
# Shut down the timer cleanly
self.timer.stop()
# clipboard persistence. see http://www.mail-archive.com/pyqt@riverbankcomputing.com/msg17328.html
event = QtCore.QEvent(QtCore.QEvent.Clipboard)
self.app.sendEvent(self.app.clipboard(), event)
if self.tray:
self.tray.hide()
self.tray.deleteLater()
self.tray = None
self._cleanup_before_exit()
self.app.aboutToQuit.connect(clean_up)
# main loop