additional config: if param not present in data, the config is simply

skipped

diff --git a/src/config.py b/src/config.py
index d36746f3389b4050607a95eedc496b6d1cb7bafe..8fac8ffac8bfdac4ee6c84e467aff3fd84c8d4a2 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -1501,22 +1501,28 @@ def _set_additional_config(data, camera):
     for name, section in sections.iteritems():
         if not section.get('set'):
             continue
+        
+        if ('@_' + name) not in data:
+            continue
 
         if section.get('get_set_dict'):
-            set_func_values.setdefault(section['set'], {})[name] = data.get('@_' + name)
+            set_func_values.setdefault(section['set'], {})[name] = data['@_' + name]
 
         else:
-            set_func_values[section['set']] = data.get('@_' + name)
+            set_func_values[section['set']] = data['@_' + name]
 
     for name, config in configs.iteritems():
         if not config.get('set'):
             continue
 
+        if ('@_' + name) not in data:
+            continue
+
         if config.get('get_set_dict'):
-            set_func_values.setdefault(config['set'], {})[name] = data.get('@_' + name)
+            set_func_values.setdefault(config['set'], {})[name] = data['@_' + name]
             
         else:
-            set_func_values[config['set']] = data.get('@_' + name)
+            set_func_values[config['set']] = data['@_' + name]
 
     for func, value in set_func_values.iteritems():
         func(value)