AaronFiore/electrum
1
0
Fork 0
Code Activity

qt init: rm gui.close() method

Browse Source 
There is gui.stop() already, which does the same thing (which is shared API with kivy).
Also, the _cleanup_before_exit() call was redundant in close(),
aboutToQuit handles that.
This commit is contained in:
SomberNight
2021-04-04 01:05:23 +02:00
parent a3b16c7640
commit 1cd5235426
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,7 @@ class ElectrumGui(Logger):
submenu.addAction(_("Close"), window.close)
m.addAction(_("Dark/Light"), self.toggle_tray_icon)
m.addSeparator()
m.addAction(_("Exit Electrum"), self.close)
m.addAction(_("Exit Electrum"), self.app.quit)
def tray_icon(self):
if self.dark_icon:
@@ -236,10 +236,6 @@ class ElectrumGui(Logger):
self.tray.deleteLater()
self.tray = None
def close(self):
self._cleanup_before_exit()
self.app.quit()
def _maybe_quit_if_no_windows_open(self) -> None:
"""Check if there are any open windows and decide whether we should quit."""
# keep daemon running after close
@@ -416,9 +412,7 @@ class ElectrumGui(Logger):
self.app.setQuitOnLastWindowClosed(False) # so _we_ can decide whether to quit
self.app.lastWindowClosed.connect(self._maybe_quit_if_no_windows_open)
def clean_up():
self._cleanup_before_exit()
self.app.aboutToQuit.connect(clean_up)
self.app.aboutToQuit.connect(self._cleanup_before_exit)
# main loop
self.app.exec_()