diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 9efb0b7f2..71b9c7ebf 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -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 = ("qutebrowser was restarted after a fatal crash!
" - "Unfortunately, this crash occurred in Qt (the library " - "qutebrowser uses), and QtWebKit (the current backend) is not " - "maintained anymore.

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', diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py index 9a1b88942..da47b6f43 100644 --- a/qutebrowser/misc/crashsignal.py +++ b/qutebrowser/misc/crashsignal.py @@ -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: