mirror
/
qutebrowser
mirror of https://github.com/qutebrowser/qutebrowser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Qt 5.15 session workaround to its own function 

See #5359

(cherry picked from commit 0c43cbdede)
This commit is contained in:
Florian Bruhin 2020-07-12 21:58:32 +02:00
parent 3d6125cf15
commit 7c03f08e08
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qutebrowser/browser/webengine/webenginetab.py
View File

@ -681,15 +681,23 @@ class WebEngineHistoryPrivate(browsertab.AbstractHistoryPrivate):
def deserialize(self, data):
qtutils.deserialize(data, self._history)
def _load_items_workaround(self, items):
"""WORKAROUND for session loading not working on Qt 5.15.
Just load the current URL, see
https://github.com/qutebrowser/qutebrowser/issues/5359
"""
if not items:
return
url = items[-1].url
if (url.scheme(), url.host()) == ('qute', 'back') and len(items) >= 2:
url = items[-2].url
self._tab.load_url(url)
def load_items(self, items):
if qtutils.version_check('5.15', compiled=False):
# WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359
if items:
url = items[-1].url
if ((url.scheme(), url.host()) == ('qute', 'back') and
len(items) >= 2):
url = items[-2].url
self._tab.load_url(url)
self._load_items_workaround(items)
return
if items: