From d83d2e442ed1a1e3e8b5b794506ff65d58efc16a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 31 Mar 2016 06:38:09 +0200 Subject: [PATCH] Work around getting an empty session title. Fixes #879. Supersedes #880. --- qutebrowser/misc/sessions.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index 36b23eda8..0e3670ad0 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -143,10 +143,18 @@ class SessionManager(QObject): history = tab.page().history() for idx, item in enumerate(history.items()): qtutils.ensure_valid(item) + item_data = { 'url': bytes(item.url().toEncoded()).decode('ascii'), - 'title': item.title(), } + + if not item.title(): + # https://github.com/The-Compiler/qutebrowser/issues/879 + if history.currentItemIndex() == idx: + item_data['title'] = tab.page().mainFrame().title() + else: + item_data['title'] = item_data['url'] + if item.originalUrl() != item.url(): encoded = item.originalUrl().toEncoded() item_data['original-url'] = bytes(encoded).decode('ascii')