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

Fix event filter when a non-Mainwindow dialog has an event.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-28 22:53:24 +02:00
parent 16c067e32d
commit 9533312e0d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/keyinput/modeman.py
View File

@ -121,7 +121,7 @@ class EventFilter(QObject):
window='current') window='current')
return modeman.eventFilter(obj, event) return modeman.eventFilter(obj, event)
except objreg.RegistryUnavailableError: except objreg.RegistryUnavailableError:
# No window available yet # No window available yet, or not a MainWindow
return False return False
except: except:
# If there is an exception in here and we leave the eventfilter # If there is an exception in here and we leave the eventfilter

10
qutebrowser/utils/objreg.py
View File

@ -99,7 +99,10 @@ def _get_registry(scope, window):
widget = tabbed_browser.currentWidget() widget = tabbed_browser.currentWidget()
if widget is None: if widget is None:
raise RegistryUnavailableError(scope) raise RegistryUnavailableError(scope)
return widget.registry try:
return widget.registry
except AttributeError:
raise RegistryUnavailableError(scope)
elif scope == 'window': elif scope == 'window':
if window is None: if window is None:
raise TypeError("window is None with scope window!") raise TypeError("window is None with scope window!")
@ -113,7 +116,10 @@ def _get_registry(scope, window):
win = window_registry[window] win = window_registry[window]
except KeyError: except KeyError:
raise RegistryUnavailableError(scope) raise RegistryUnavailableError(scope)
return win.registry try:
return win.registry
except AttributeError:
raise RegistryUnavailableError(scope)
elif scope == 'meta': elif scope == 'meta':
return meta_registry return meta_registry
else: else: