Merge branch 'master' of https://github.com/Yatekii/qutebrowser into Yatekii-master

This commit is contained in:
Florian Bruhin 2016-05-24 21:32:24 +02:00
commit 0fb6e508e6

View File

@ -343,18 +343,14 @@ def _save_version():
@pyqtSlot('QWidget*', 'QWidget*')
def on_focus_changed(_old, new):
"""Register currently focused main window in the object registry."""
if new is None:
window = None
else:
window = new.window()
if window is None or not isinstance(window, mainwindow.MainWindow):
if new is None or not isinstance(new, mainwindow.MainWindow):
try:
objreg.delete('last-focused-main-window')
except KeyError:
pass
qApp.restoreOverrideCursor()
else:
objreg.register('last-focused-main-window', window, update=True)
objreg.register('last-focused-main-window', new.window(), update=True)
_maybe_hide_mouse_cursor()