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

Merge remote-tracking branch 'origin/pr/3666'

Browse Source
This commit is contained in:
Florian Bruhin 2018-03-05 18:38:37 +01:00
commit 9be26a8bfd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/webkit/webpage.py
View File

@ -22,6 +22,7 @@
import html import html
import functools import functools
import sip
from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QPoint from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QPoint
from PyQt5.QtGui import QDesktopServices from PyQt5.QtGui import QDesktopServices
from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
@ -302,6 +303,10 @@ class BrowserPage(QWebPage):
Args: Args:
frame: The QWebFrame to inject the user scripts into. 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() url = frame.url()
if url.isEmpty(): if url.isEmpty():
url = frame.requestedUrl() url = frame.requestedUrl()