diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-01-11 12:00:30 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-01-11 18:47:15 +0100 |
commit | c1758230200814e84055f3e2954cb69f0fddf5d8 (patch) | |
tree | b9123f2c04e3337084e0894c0bb17574b9704311 /qutebrowser/misc/sessions.py | |
parent | 8760dc1b17dcf06f7253a9ce7ac7a15af0785492 (diff) | |
download | qutebrowser-c1758230200814e84055f3e2954cb69f0fddf5d8.tar.gz qutebrowser-c1758230200814e84055f3e2954cb69f0fddf5d8.zip |
Add objects.qapp to avoid needing to None-check
We know that QApplication.instance() will always be non-None for
practical purposes, but the stubs now (correctly) declare it as
Optional.
See https://github.com/stlehmann/PyQt5-stubs/pull/126
Diffstat (limited to 'qutebrowser/misc/sessions.py')
-rw-r--r-- | qutebrowser/misc/sessions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index b4aa72f32..d38b538d4 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -28,7 +28,6 @@ import shutil from typing import Any, Iterable, MutableMapping, MutableSequence, Optional, Union, cast from PyQt5.QtCore import Qt, QUrl, QObject, QPoint, QTimer, QDateTime -from PyQt5.QtWidgets import QApplication import yaml from qutebrowser.utils import (standarddir, objreg, qtutils, log, message, @@ -38,6 +37,7 @@ from qutebrowser.config import config, configfiles from qutebrowser.completion.models import miscmodels from qutebrowser.mainwindow import mainwindow from qutebrowser.qt import sip +from qutebrowser.misc import objects _JsonType = MutableMapping[str, Any] @@ -283,7 +283,7 @@ class SessionManager(QObject): continue win_data: _JsonType = {} - active_window = QApplication.instance().activeWindow() + active_window = objects.qapp.activeWindow() if getattr(active_window, 'win_id', None) == win_id: win_data['active'] = True win_data['geometry'] = bytes(main_window.saveGeometry()) |