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

Reintroduce crash dialogs for QtWebKit

Browse Source
This commit is contained in:
Florian Bruhin 2017-09-26 19:25:53 +02:00
parent 6b5d34c7fb
commit 1704438777
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qutebrowser/misc/crashdialog.py
View File

@ -65,41 +65,6 @@ def parse_fatal_stacktrace(text):
return (m.group(1), m.group(3))
def get_fatal_crash_dialog(debug, data):
"""Get a fatal crash dialog based on a crash log.
If the crash is a segfault in qt_mainloop and we're on an old Qt version
this is a simple error dialog which lets the user know they should upgrade
if possible.
If it's anything else, it's a normal FatalCrashDialog with the possibility
to report the crash.
Args:
debug: Whether the debug flag (--debug) was given.
data: The crash log data.
"""
ignored_frames = ['qt_mainloop', 'paintEvent']
errtype, frame = parse_fatal_stacktrace(data)
if (errtype == 'Segmentation fault' and
frame in ignored_frames and
objects.backend == usertypes.Backend.QtWebKit):
title = "qutebrowser was restarted after a fatal crash!"
text = ("<b>qutebrowser was restarted after a fatal crash!</b><br/>"
"Unfortunately, this crash occurred in Qt (the library "
"qutebrowser uses), and QtWebKit (the current backend) is not "
"maintained anymore.<br/><br/>Since I can't do much about "
"those crashes I disabled the crash reporter for this case, "
"but this will likely be resolved in the future with the new "
"QtWebEngine backend.")
box = QMessageBox(QMessageBox.Critical, title, text, QMessageBox.Ok)
box.setAttribute(Qt.WA_DeleteOnClose)
return box
else:
return FatalCrashDialog(debug, data)
def _get_environment_vars():
"""Gather environment variables for the crash info."""
masks = ('DESKTOP_SESSION', 'DE', 'QT_*', 'PYTHON*', 'LC_*', 'LANG',

2
qutebrowser/misc/crashsignal.py
View File

@ -94,7 +94,7 @@ class CrashHandler(QObject):
if data:
# Crashlog exists and has data in it, so something crashed
# previously.
self._crash_dialog = crashdialog.get_fatal_crash_dialog(
self._crash_dialog = crashdialog.FatalCrashDialog(
self._args.debug, data)
self._crash_dialog.show()
else: