add parental control setup to the start wizard

[enigma2.git] / lib / python / Components / config.py

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 38a231469b451daae65a730724cbcfd9be008de6..b7b3baa84ee24b2310f9c9cfaaad0f634b81321a 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -803,7 +803,8 @@ class Config(ConfigSubsection):
 
                # we inherit from ConfigSubsection, so ...
                #object.__setattr__(self, "saved_value", tree["config"])
-               self.setSavedValue(tree["config"])
+               if "config" in tree:
+                       self.setSavedValue(tree["config"])
 
        def saveToFile(self, filename):
                f = open(filename, "w")
@@ -819,7 +820,7 @@ config = Config()
 config.misc = ConfigSubsection()
 
 class ConfigFile:
-       CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "config2")
+       CONFIG_FILE = resolveFilename(SCOPE_CONFIG, "settings")
 
        def load(self):
                try: