From 5ce1229ee5248a0fd9c20266143163acb41ba225 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 26 Oct 2018 10:05:44 +0200
Subject: [PATCH] Add temporary fix for test_caret.py flakiness

Fixes #4311
Conflicts with #4087, we might be able to revert this for that PR.
---
 qutebrowser/browser/browsertab.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 3964472df..bb0b31626 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -917,7 +917,12 @@ class AbstractTab(QWidget):
             # https://github.com/qutebrowser/qutebrowser/issues/3498
             return
 
-        sess_manager = objreg.get('session-manager')
+        try:
+            sess_manager = objreg.get('session-manager')
+        except KeyError:
+            # https://github.com/qutebrowser/qutebrowser/issues/4311
+            return
+
         sess_manager.save_autosave()
 
         if ok and not self._has_ssl_errors: