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

Fix #889 during a webpage shutdown.

Browse Source 
If we're in the middle of closing a WebPage, the webview will still be
registered, but already deleted by Qt - so we get a RuntimeError/TypeError
there.
This commit is contained in:
Florian Bruhin 2015-11-09 18:22:35 +01:00
parent dce44f2dc5
commit 65648da1ad
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qutebrowser/browser/network/networkmanager.py
View File

@ -360,17 +360,21 @@ class NetworkManager(QNetworkAccessManager):
req.setRawHeader('DNT'.encode('ascii'), dnt) req.setRawHeader('DNT'.encode('ascii'), dnt)
req.setRawHeader('X-Do-Not-Track'.encode('ascii'), dnt) req.setRawHeader('X-Do-Not-Track'.encode('ascii'), dnt)
if self._tab_id is None: # There are some scenarios where we can't figure out current_url:
current_url = QUrl() # generic NetworkManager, e.g. for downloads # - There's a generic NetworkManager, e.g. for downloads
else: # - The download was in a tab which is now closed.
current_url = QUrl()
if self._tab_id is not None:
try: try:
webview = objreg.get('webview', scope='tab', webview = objreg.get('webview', scope='tab',
window=self._win_id, tab=self._tab_id) window=self._win_id, tab=self._tab_id)
except KeyError:
# https://github.com/The-Compiler/qutebrowser/issues/889
current_url = QUrl()
else:
current_url = webview.url() current_url = webview.url()
except (KeyError, RuntimeError, TypeError):
# https://github.com/The-Compiler/qutebrowser/issues/889
# Catching RuntimeError and TypeError because we could be in
# the middle of the webpage shutdown here.
current_url = QUrl()
self.set_referer(req, current_url) self.set_referer(req, current_url)