diff --git a/qutebrowser/app.py b/qutebrowser/app.py index becd548f6..d0090caea 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -43,7 +43,7 @@ from qutebrowser.browser import quickmarks, cookies, downloads, cache from qutebrowser.widgets import mainwindow, console, crash from qutebrowser.keyinput import modeparsers, keyparser, modeman from qutebrowser.utils import (log, version, message, utilcmds, readline, - utils, qtutils, urlutils) + utils, qtutils, urlutils, debug) from qutebrowser.utils import usertypes as utypes @@ -767,4 +767,7 @@ class Application(QApplication): def exit(self, status): """Extend QApplication::exit to log the event.""" log.destroy.debug("Now calling QApplication::exit.") + if self.args.debug_exit: + print("Now logging late shutdown.", file=sys.stderr) + debug.trace_lines(True) super().exit(status) diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py index bd8a71137..dfc1ae57c 100644 --- a/qutebrowser/qutebrowser.py +++ b/qutebrowser/qutebrowser.py @@ -116,7 +116,6 @@ def main(): earlyinit.check_pygments() # We do this import late as we need to fix harfbuzz first. from qutebrowser import app - from qutebrowser.utils import debug from PyQt5.QtCore import pyqtRemoveInputHook import PyQt5.QtWidgets as QtWidgets # We don't use qutebrowser via the interactive shell, but we want to be @@ -131,8 +130,5 @@ def main(): # FIXME: We should do another attempt at contacting upstream about this. QtWidgets.qApp = app ret = app.exec_() - if args.debug_exit: - print("Now logging late shutdown.", file=sys.stderr) - debug.trace_lines(True) QtWidgets.qApp = None return ret