From bb648b62f38ca4e1fffcb13456eedda059f18e67 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 15 Sep 2017 11:36:20 +0200
Subject: [PATCH] Make sure we honour config_api.load_autoconfig even with
 errors

We don't raise ConfigFileErrors inside read_config_py so we can get back the
config_api object. Instead we raise it in config.init().
---
 qutebrowser/config/config.py      | 6 +++++-
 qutebrowser/config/configfiles.py | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 4b244136e..51b49d6b9 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -660,15 +660,19 @@ def init(parent=None):
     objreg.register('config-commands', config_commands)
 
     global _errbox
+    config_api = None
+
     try:
         config_api = configfiles.read_config_py()
+        # Raised here so we get the config_api back.
+        if config_api.errors:
+            raise configexc.ConfigFileErrors('config.py', config_api.errors)
     except configexc.ConfigFileErrors as e:
         _errbox = msgbox.msgbox(parent=None,
                                 title="Error while reading config",
                                 text=e.to_html(),
                                 icon=QMessageBox.Warning,
                                 plain_text=False)
-        config_api = None
     else:
         _errbox = None
 
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index e7ca548f7..b8f5e6a28 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -193,9 +193,6 @@ def read_config_py(filename=None):
             exception=e, traceback=traceback.format_exc()))
 
     api.finalize()
-    if api.errors:
-        raise configexc.ConfigFileErrors(basename, api.errors)
-
     return api