From e1012501ec826618fc1cfcc91e3e6a83b6189cf6 Mon Sep 17 00:00:00 2001 From: thuck Date: Sun, 13 Nov 2016 12:10:03 +0100 Subject: [PATCH] Issue only happens when using webengine Check if using webengine, before trying to use thw workaround --- qutebrowser/browser/browsertab.py | 1 - qutebrowser/browser/webengine/webenginetab.py | 1 + qutebrowser/mainwindow/tabbedbrowser.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 3e5c6e01b..22f1c7e51 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -560,7 +560,6 @@ class AbstractTab(QWidget): self._mouse_event_filter = mouse.MouseEventFilter( self, widget_class=self.WIDGET_CLASS, parent=self) self.backend = None - self.needs_qtbug54419_workaround = False # FIXME:qtwebengine Should this be public api via self.hints? # Also, should we get it out of objreg? diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 67c9df258..acef4e5ef 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -472,6 +472,7 @@ class WebEngineTab(browsertab.AbstractTab): # init js stuff self._init_js() self._child_event_filter = None + self.needs_qtbug54419_workaround = False def _init_js(self): js_code = '\n'.join([ diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 7dfd9b8fd..915e927c7 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -521,7 +521,8 @@ class TabbedBrowser(tabwidget.TabWidget): # If needed, re-open the tab as a workaround for QTBUG-54419. # See https://bugreports.qt.io/browse/QTBUG-54419 - if tab.needs_qtbug54419_workaround: + if (tab.backend == usertypes.Backend.QtWebEngine and + tab.needs_qtbug54419_workaround): log.misc.debug("Doing QTBUG-54419 workaround for {}, " "url {}".format(tab, url)) self.setUpdatesEnabled(False)