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

Never disconnect signal from destroyed frames.

Browse Source 
Fixes #152 - hopefully really this time!
This commit is contained in:
Florian Bruhin 2014-12-02 21:09:03 +01:00
parent cd5f77210c
commit 99fb516aa3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/browser/hints.py
View File

@ -58,6 +58,8 @@ class HintContext:
Attributes: Attributes:
frames: The QWebFrames to use. frames: The QWebFrames to use.
destroyed_frames: QWebFrames which have been destroyed.
(Workaround for https://github.com/The-Compiler/qutebrowser/issues/152)
elems: A mapping from keystrings to (elem, label) namedtuples. elems: A mapping from keystrings to (elem, label) namedtuples.
baseurl: The URL of the current page. baseurl: The URL of the current page.
target: What to do with the opened links. target: What to do with the opened links.
@ -78,6 +80,7 @@ class HintContext:
self.baseurl = None self.baseurl = None
self.to_follow = None self.to_follow = None
self.frames = [] self.frames = []
self.destroyed_frames = []
self.args = [] self.args = []
def get_args(self, urlstr): def get_args(self, urlstr):
@ -145,6 +148,11 @@ class HintManager(QObject):
pass pass
for f in self._context.frames: for f in self._context.frames:
log.hints.debug("Disconnecting frame {}".format(f)) log.hints.debug("Disconnecting frame {}".format(f))
if any(e is f for e in self._context.destroyed_frames):
# WORKAROUND for
# https://github.com/The-Compiler/qutebrowser/issues/152
log.hints.debug("Frame has been destroyed, ignoring.")
continue
try: try:
f.contentsSizeChanged.disconnect(self.on_contents_size_changed) f.contentsSizeChanged.disconnect(self.on_contents_size_changed)
except TypeError: except TypeError:
@ -643,6 +651,11 @@ class HintManager(QObject):
self._context.target = target self._context.target = target
self._context.baseurl = tabbed_browser.current_url() self._context.baseurl = tabbed_browser.current_url()
self._context.frames = webelem.get_child_frames(mainframe) self._context.frames = webelem.get_child_frames(mainframe)
for frame in self._context.frames:
# WORKAROUND for
# https://github.com/The-Compiler/qutebrowser/issues/152
frame.destroyed.connect(functools.partial(
self._context.destroyed_frames.append, frame))
self._context.args = args self._context.args = args
self._init_elements(mainframe, group) self._init_elements(mainframe, group)
message_bridge = objreg.get('message-bridge', scope='window', message_bridge = objreg.get('message-bridge', scope='window',