rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More crash handling fixes.

Browse Source
This commit is contained in:
Florian Bruhin 2014-02-17 20:39:15 +01:00
parent 14a090c087
commit 57b2dc84fc
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qutebrowser/app.py
View File

@ -20,6 +20,7 @@
import os import os
import sys import sys
import logging import logging
import functools
import subprocess import subprocess
from signal import signal, SIGINT from signal import signal, SIGINT
from argparse import ArgumentParser from argparse import ArgumentParser
@ -71,9 +72,11 @@ class QuteBrowser(QApplication):
args = None # ArgumentParser args = None # ArgumentParser
timers = None timers = None
shutting_down = False shutting_down = False
_quit_status = None
def __init__(self): def __init__(self):
super().__init__(sys.argv) super().__init__(sys.argv)
self._quit_status = {}
sys.excepthook = self._exception_hook sys.excepthook = self._exception_hook
self._parseopts() self._parseopts()
@ -189,6 +192,8 @@ class QuteBrowser(QApplication):
return return
except Exception: except Exception:
self.quit() self.quit()
self._quit_status['crash'] = False
self._quit_status['shutdown'] = False
try: try:
pages = self._recover_pages() pages = self._recover_pages()
except Exception: except Exception:
@ -219,10 +224,18 @@ class QuteBrowser(QApplication):
logging.debug('Running {} with args {}'.format(sys.executable, logging.debug('Running {} with args {}'.format(sys.executable,
argv)) argv))
subprocess.Popen(argv) subprocess.Popen(argv)
try: self._maybe_quit('crash')
def _maybe_quit(self, sender):
"""Maybe quit qutebrowser.
This only quits if both the CrashDialog was ready to quit AND the
shutdown is complete.
"""
self._quit_status[sender] = True
logging.debug("maybe_quit called from {}, quit status {}".format(sender, self._quit_status))
if all(self._quit_status.values()):
self.quit() self.quit()
except Exception:
sys.exit(1)
def _python_hacks(self): def _python_hacks(self):
"""Get around some PyQt-oddities by evil hacks. """Get around some PyQt-oddities by evil hacks.
@ -306,6 +319,9 @@ class QuteBrowser(QApplication):
try: try:
if do_quit: if do_quit:
self.mainwindow.tabs.shutdown_complete.connect(self.quit) self.mainwindow.tabs.shutdown_complete.connect(self.quit)
else:
self.mainwindow.tabs.shutdown_complete.connect(
functools.partial(self._maybe_quit, 'shutdown'))
self.mainwindow.tabs.shutdown() self.mainwindow.tabs.shutdown()
except AttributeError: # mainwindow or tabs could still be None except AttributeError: # mainwindow or tabs could still be None
logging.debug("No mainwindow/tabs to shut down.") logging.debug("No mainwindow/tabs to shut down.")