diff options
| author | Florian Bruhin <git@the-compiler.org> | 2018-03-05 18:38:37 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2018-03-05 18:38:37 +0100 |
| commit | 9be26a8bfd98e395e5a3181ca403b905537c83b7 (patch) | |
| tree | fa31a1eb7fc514b3f17cb9f0f156473b4db4bbf0 | |
| parent | 333a37ffb2b0720f06f24bcf8925a15922318c41 (diff) | |
| parent | 6d415b6653a5060b39e45c291ee5c11714c0b51a (diff) | |
| download | qutebrowser-9be26a8bfd98e395e5a3181ca403b905537c83b7.tar.gz qutebrowser-9be26a8bfd98e395e5a3181ca403b905537c83b7.zip | |
Merge remote-tracking branch 'origin/pr/3666'
| -rw-r--r-- | qutebrowser/browser/webkit/webpage.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index aebf53d87..7b0a5caf5 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -22,6 +22,7 @@ import html import functools +import sip from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QPoint from PyQt5.QtGui import QDesktopServices from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest @@ -302,6 +303,10 @@ class BrowserPage(QWebPage): Args: frame: The QWebFrame to inject the user scripts into. """ + if sip.isdeleted(frame): + log.greasemonkey.debug("_inject_userjs called for deleted frame!") + return + url = frame.url() if url.isEmpty(): url = frame.requestedUrl() |