rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't crash if data is None while saving session

Browse Source 
Under some circumstances I can't reproduce (switching/turning off
monitors?) it seems it's possible that SessionManager.save gets called
with last_window=True, without on_last_window_closed being called.

This might be to one of the Qt screen management bugs fixed in Qt 5.6,
which would explain why I can't reproduce it.

Instead of crashing, let's log the error and not save the session.
This commit is contained in:
Florian Bruhin 2016-04-10 17:47:14 +02:00
parent 20f80610be
commit a33aa524de
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/misc/sessions.py
View File

@ -241,7 +241,9 @@ class SessionManager(QObject):
log.sessions.debug("Saving session {} to {}...".format(name, path)) log.sessions.debug("Saving session {} to {}...".format(name, path))
if last_window: if last_window:
data = self._last_window_session data = self._last_window_session
assert data is not None if data is None:
log.sessions.error("last_window_session is None while saving!")
return
else: else:
data = self._save_all() data = self._save_all()
log.sessions.vdebug("Saving data: {}".format(data)) log.sessions.vdebug("Saving data: {}".format(data))