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

Show error page for renderer process crashes on 5.9

Browse Source 
Fixes #2291
This commit is contained in:
Florian Bruhin 2017-05-16 07:50:26 +02:00
parent bdf56e63dd
commit a4021e8e7a
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -31,7 +31,7 @@ from qutebrowser.keyinput import modeman
from qutebrowser.mainwindow import tabwidget from qutebrowser.mainwindow import tabwidget
from qutebrowser.browser import signalfilter, browsertab from qutebrowser.browser import signalfilter, browsertab
from qutebrowser.utils import (log, usertypes, utils, qtutils, objreg, from qutebrowser.utils import (log, usertypes, utils, qtutils, objreg,
urlutils, message) urlutils, message, jinja)
UndoEntry = collections.namedtuple('UndoEntry', ['url', 'history', 'index']) UndoEntry = collections.namedtuple('UndoEntry', ['url', 'history', 'index'])
@ -665,21 +665,29 @@ class TabbedBrowser(tabwidget.TabWidget):
def _on_renderer_process_terminated(self, tab, status, code): def _on_renderer_process_terminated(self, tab, status, code):
"""Show an error when a renderer process terminated.""" """Show an error when a renderer process terminated."""
if status == browsertab.TerminationStatus.normal: if status == browsertab.TerminationStatus.normal:
pass return
elif status == browsertab.TerminationStatus.abnormal:
message.error("Renderer process exited with status {}".format(
code))
elif status == browsertab.TerminationStatus.crashed:
message.error("Renderer process crashed")
elif status == browsertab.TerminationStatus.killed:
message.error("Renderer process was killed")
elif status == browsertab.TerminationStatus.unknown:
message.error("Renderer process did not start")
else:
raise ValueError("Invalid status {}".format(status))
if not qtutils.version_check('5.9'): messages = {
browsertab.TerminationStatus.abnormal:
"Renderer process exited with status {}".format(code),
browsertab.TerminationStatus.crashed:
"Renderer process crashed",
browsertab.TerminationStatus.killed:
"Renderer process was killed",
browsertab.TerminationStatus.unknown:
"Renderer process did not start",
}
msg = messages[status]
if qtutils.version_check('5.9'):
url_string = tab.url(requested=True).toDisplayString()
error_page = jinja.render(
'error.html', title="Error loading page".format(url_string),
url=url_string, error=msg, icon='')
QTimer.singleShot(0, lambda: tab.set_html(error_page))
else:
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58698
message.error(msg)
self._remove_tab(tab, crashed=True) self._remove_tab(tab, crashed=True)
if self.count() == 0: if self.count() == 0:
self.tabopen(QUrl('about:blank')) self.tabopen(QUrl('about:blank'))