summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py6
-rw-r--r--qutebrowser/html/warning-sessions.html1
2 files changed, 6 insertions, 1 deletions
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 647fa60ab..f61404f4e 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -648,7 +648,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>