Merge remote-tracking branch 'origin/pr/3666'
This commit is contained in:
commit
9be26a8bfd
@ -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()
|
||||||
|
Loading…
Reference in New Issue
Block a user