From bbc4756f9e8180c7a40c57f8a35e39dee7be7807 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Thu, 12 Aug 2021 20:54:25 -0700 Subject: [PATCH] Settings fix, refs #1433 --- datasette/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datasette/app.py b/datasette/app.py index 8cbaaf9f..adc543ef 100644 --- a/datasette/app.py +++ b/datasette/app.py @@ -277,7 +277,7 @@ class Datasette: self.static_mounts = static_mounts or [] if config_dir and (config_dir / "config.json").exists(): raise StartupError("config.json should be renamed to settings.json") - if config_dir and (config_dir / "settings.json").exists() and not config: + if config_dir and (config_dir / "settings.json").exists() and not settings: config = json.loads((config_dir / "settings.json").read_text()) self._settings = dict(DEFAULT_SETTINGS, **(settings or {})) self.renderers = {} # File extension -> (renderer, can_render) functions