AaronFiore/electrum
1
0
Fork 0
Code Activity

qt init: move Ctrl-C handling earlier

Browse Source
This commit is contained in:
SomberNight
2021-04-06 18:27:28 +02:00
parent 94774c6ad2
commit c41cd4ae04
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,6 +393,12 @@ class ElectrumGui(Logger):
wizard.terminate() wizard.terminate()
def main(self): def main(self):
# setup Ctrl-C handling and tear-down code first, so that user can easily exit whenever
self.app.setQuitOnLastWindowClosed(False) # so _we_ can decide whether to quit
self.app.lastWindowClosed.connect(self._maybe_quit_if_no_windows_open)
self.app.aboutToQuit.connect(self._cleanup_before_exit)
signal.signal(signal.SIGINT, lambda *args: self.app.quit())
# first-start network-setup
try: try:
self.init_network() self.init_network()
except UserCancelled: except UserCancelled:
@@ -402,18 +408,11 @@ class ElectrumGui(Logger):
except Exception as e: except Exception as e:
self.logger.exception('') self.logger.exception('')
return return
# start wizard to select/create wallet
self.timer.start() self.timer.start()
path = self.config.get_wallet_path(use_gui_last_wallet=True) path = self.config.get_wallet_path(use_gui_last_wallet=True)
if not self.start_new_window(path, self.config.get('url'), app_is_starting=True): if not self.start_new_window(path, self.config.get('url'), app_is_starting=True):
return return
signal.signal(signal.SIGINT, lambda *args: self.app.quit())
self.app.setQuitOnLastWindowClosed(False) # so _we_ can decide whether to quit
self.app.lastWindowClosed.connect(self._maybe_quit_if_no_windows_open)
self.app.aboutToQuit.connect(self._cleanup_before_exit)
# main loop # main loop
self.app.exec_() self.app.exec_()
# on some platforms the exec_ call may not return, so use clean_up() # on some platforms the exec_ call may not return, so use clean_up()