From 1eb3f84bce43affa62810d40ec8f3a7e67fbb070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 6 Jul 2015 17:06:30 +0200 Subject: [PATCH] Also handle partial timelapse settings gracefully Server startup could fail if for whatever reason the timelapse settings had lost their type value, since the dict was not merged with the default values upon retrieval. --- src/octoprint/timelapse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index 55525377..7f32076b 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -68,7 +68,7 @@ def configureTimelapse(config=None, persist=False): global current if config is None: - config = settings().get(["webcam", "timelapse"]) + config = settings().get(["webcam", "timelapse"], merged=True) if current is not None: current.unload()