summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-08-01 17:25:55 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-08-02 10:52:24 +0200
commite32fbe901354fa38f88bae22a48d294940054dda (patch)
treedf078ca6fe98240015913139bfdeadfdfd67fb95
parent776a16bf658636ec1e50e6389f9e253c1e4ea76a (diff)
downloadqutebrowser-e32fbe901354fa38f88bae22a48d294940054dda.tar.gz
qutebrowser-e32fbe901354fa38f88bae22a48d294940054dda.zip
QtWebEngine: Fix crash when closing/reopening tabs
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 204199c72..86f3ce787 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -211,7 +211,11 @@ class WebEngineScroller(browsertab.AbstractScroller):
"""Update the scroll position attributes when it changed."""
def update_scroll_pos(jsret):
"""Callback after getting scroll position via JS."""
- assert isinstance(jsret, dict)
+ if jsret is None:
+ # This can happen when the callback would get called after
+ # shutting down a tab
+ return
+ assert isinstance(jsret, dict), jsret
self._pos_perc = (jsret['perc']['x'], jsret['perc']['y'])
self._pos_px = QPoint(jsret['px']['x'], jsret['px']['y'])
self.perc_changed.emit(*self._pos_perc)