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

Close contextmenu when closing tab to avoid crash.

Browse Source 
Fixes #494.
This commit is contained in:
Florian Bruhin 2015-01-31 21:01:03 +01:00
parent 55649882a0
commit 9736224fa6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/browser/webview.py
View File

@ -79,12 +79,14 @@ class WebView(QWebView):
linkHovered: QWebPages linkHovered signal exposed. linkHovered: QWebPages linkHovered signal exposed.
load_status_changed: The loading status changed load_status_changed: The loading status changed
url_text_changed: Current URL string changed. url_text_changed: Current URL string changed.
shutting_down: Emitted when the view is shutting down.
""" """
scroll_pos_changed = pyqtSignal(int, int) scroll_pos_changed = pyqtSignal(int, int)
linkHovered = pyqtSignal(str, str, str) linkHovered = pyqtSignal(str, str, str)
load_status_changed = pyqtSignal(str) load_status_changed = pyqtSignal(str)
url_text_changed = pyqtSignal(str) url_text_changed = pyqtSignal(str)
shutting_down = pyqtSignal()
def __init__(self, win_id, parent=None): def __init__(self, win_id, parent=None):
super().__init__(parent) super().__init__(parent)
@ -303,6 +305,7 @@ class WebView(QWebView):
def shutdown(self): def shutdown(self):
"""Shut down the webview.""" """Shut down the webview."""
self.shutting_down.emit()
# We disable javascript because that prevents some segfaults when # We disable javascript because that prevents some segfaults when
# quitting it seems. # quitting it seems.
log.destroy.debug("Shutting down {!r}.".format(self)) log.destroy.debug("Shutting down {!r}.".format(self))
@ -534,3 +537,9 @@ class WebView(QWebView):
# We want to make sure we check the focus element after the WebView is # We want to make sure we check the focus element after the WebView is
# updated completely. # updated completely.
QTimer.singleShot(0, self.mouserelease_insertmode) QTimer.singleShot(0, self.mouserelease_insertmode)
def contextMenuEvent(self, e):
"""Save a reference to the context menu so we can close it."""
menu = self.page().createStandardContextMenu()
self.shutting_down.connect(menu.close)
menu.exec_(e.globalPos())