diff options
author | Florian Bruhin <me@the-compiler.org> | 2024-04-30 15:26:04 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2024-04-30 15:26:04 +0200 |
commit | 26ef6bffd261d4ac876bbb35612a5a0b7a6232e7 (patch) | |
tree | c3802cd488b49e91fb543e43c81286b2ecb9a559 | |
parent | eb65fb1a7d342538e2e268d9052bab4583ff6e69 (diff) | |
download | qutebrowser-26ef6bffd261d4ac876bbb35612a5a0b7a6232e7.tar.gz qutebrowser-26ef6bffd261d4ac876bbb35612a5a0b7a6232e7.zip |
tabbedbrowser: Clean up QTBUG 91715 workaround
By returning early, we can move the logic up a bit and handle the normal case after.
-rw-r--r-- | qutebrowser/mainwindow/tabbedbrowser.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 28f32c4fd..47d8dc680 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -1011,16 +1011,11 @@ class TabbedBrowser(QWidget): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-91715 versions = version.qtwebengine_versions() - is_qtbug_91715 = ( + if ( status == browsertab.TerminationStatus.unknown and code == 1002 and - versions.webengine == utils.VersionNumber(5, 15, 3)) - - def show_error_page(html): - tab.set_html(html) - log.webview.error(msg) - - if is_qtbug_91715: + versions.webengine == utils.VersionNumber(5, 15, 3) + ): log.webview.error(msg) log.webview.error('') log.webview.error( @@ -1034,12 +1029,17 @@ class TabbedBrowser(QWidget): 'A proper fix is likely available in QtWebEngine soon (which is why ' 'the workaround is disabled by default).') log.webview.error('') - else: - url_string = tab.url(requested=True).toDisplayString() - error_page = jinja.render( - 'error.html', title="Error loading {}".format(url_string), - url=url_string, error=msg) - QTimer.singleShot(100, lambda: show_error_page(error_page)) + return + + def show_error_page(html): + tab.set_html(html) + log.webview.error(msg) + + url_string = tab.url(requested=True).toDisplayString() + error_page = jinja.render( + 'error.html', title="Error loading {}".format(url_string), + url=url_string, error=msg) + QTimer.singleShot(100, lambda: show_error_page(error_page)) def resizeEvent(self, e): """Extend resizeEvent of QWidget to emit a resized signal afterwards. |