From cce0c29328f6870f534ec982c446148228c0fa60 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 24 Aug 2014 20:42:41 +0300 Subject: [PATCH] fixed main config issue where both old and new motion directives were used --- src/config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config.py b/src/config.py index d9ce121..da32dbc 100644 --- a/src/config.py +++ b/src/config.py @@ -94,7 +94,7 @@ def get_main(as_lines=False): if settings.LOCAL_TIME_FILE: _get_localtime_settings(main_config) - _set_default_motion(main_config) + _set_default_motion(main_config, old_motion=_is_old_motion()) _main_config_cache = main_config @@ -104,14 +104,14 @@ def get_main(as_lines=False): def set_main(main_config): global _main_config_cache - old_motion = _is_old_motion() + main_config = dict(main_config) + _set_default_motion(main_config, old_motion=_is_old_motion()) + _main_config_cache = main_config - _set_default_motion(main_config, old_motion) - _main_config_cache = dict(main_config) - + main_config = dict(main_config) _set_wifi_settings(main_config) _set_localtime_settings(main_config) - + config_file_path = os.path.join(settings.CONF_PATH, _MAIN_CONFIG_FILE_NAME) # read the actual configuration from file @@ -1226,7 +1226,7 @@ def _is_old_motion(): return False -def _set_default_motion(data, old_motion=False): +def _set_default_motion(data, old_motion): data.setdefault('@enabled', True) data.setdefault('@show_advanced', False) -- 2.39.5