diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-05-26 16:48:00 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-05-26 16:48:00 +0200 |
| commit | 093a454bf4e386eda8715bc3ea2b217760d5f070 (patch) | |
| tree | a73e65940639e6808609c41c104a94c3e8526216 | |
| parent | e5c2c0fb799c4a2837aeedaabd366e0c7c299575 (diff) | |
| download | qutebrowser-093a454bf4e386eda8715bc3ea2b217760d5f070.tar.gz qutebrowser-093a454bf4e386eda8715bc3ea2b217760d5f070.zip | |
Update Qt 5.15 session workaround for lazy_restore
See #5359
| -rw-r--r-- | doc/changelog.asciidoc | 3 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 6 | ||||
| -rw-r--r-- | qutebrowser/html/warning-sessions.html | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 741558ec1..d6e42e2b6 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -66,6 +66,9 @@ Fixed `QWebEngineFindTextResult` handling added in v1.11.0. - When entering caret selection mode (`v, v`) very early before a page is loaded, an error is now shown instead of a crash happening. +- The workaround for session loading with Qt 5.15 now handles + `sessions.lazy_restore` so that the saved page is loaded instead of the + "stub" page with no possibility to get to the web page. v1.11.1 (2020-05-07) -------------------- diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 709c5c1b5..5fd4a9e11 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -685,7 +685,11 @@ class WebEngineHistoryPrivate(browsertab.AbstractHistoryPrivate): if qtutils.version_check('5.15', compiled=False): # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359 if items: - self._tab.load_url(items[-1].url) + url = items[-1].url + if ((url.scheme(), url.host()) == ('qute', 'back') and + len(items) >= 2): + url = items[-2].url + self._tab.load_url(url) return if items: diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html index f93971c6a..dd0c4127b 100644 --- a/qutebrowser/html/warning-sessions.html +++ b/qutebrowser/html/warning-sessions.html @@ -15,6 +15,7 @@ qute://warning/sessions</span> to show it again at a later time.</span> <ul> <li>Loading a session with this release will <b>only load the most recently opened page</b> for every tab. As a result, the back/forward-history of every tab <b>will be lost</b> as soon as the session is saved again.</li> + <li>Due to that, the <span class="mono">session.lazy_restore</span> setting does not have any effect.</li> <li>A one-time backup of the session folder has been created at <span class="mono">{{ datadir }}{{ sep }}sessions{{ sep }}before-qt-515</span>.</li> </ul> |