Merge branch 'master' of git.opendreambox.org:/git/enigma2

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 1efb8a56f42b827e6e7631dc60f6fb82de6bd2a7..6eeca698edfdf08a5f7e22a6ebf6caead624c818 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -183,9 +183,8 @@ class ConfigSelection(ConfigElement):
                        default = self.choices[0]
 
                assert default in self.choices, "default must be in choice list, but " + repr(default) + " is not!"
-               for x in self.choices:
-                       assert isinstance(x, str), "ConfigSelection choices must be strings"
-               
+#              for x in self.choices:
+#                      assert isinstance(x, str), "ConfigSelection choices must be strings"
                self.default = default
 
                if self.value == None or not self.value in self.choices:
@@ -630,11 +629,12 @@ class ConfigClock(ConfigSequence):
        def increment(self):
                # Check if Minutes maxed out
                if self._value[1] == 59:
-                       # Check if Hours not maxed out
+                       # Increment Hour, reset Minutes
                        if self._value[0] < 23:
-                               # Increment Hour, reset Minutes to 0
                                self._value[0] += 1
-                               self._value[1] = 0
+                       else:
+                               self._value[0] = 0
+                       self._value[1] = 0
                else:
                        # Increment Minutes
                        self._value[1] += 1
@@ -644,11 +644,12 @@ class ConfigClock(ConfigSequence):
        def decrement(self):
                # Check if Minutes is minimum
                if self._value[1] == 0:
-                       # Check if Hour is greater than 0
+                       # Decrement Hour, set Minutes to 59
                        if self._value[0] > 0:
-                               # Decrement Hour, set Minutes to 59
                                self._value[0] -= 1
-                               self._value[1] = 59
+                       else:
+                               self._value[0] = 23
+                       self._value[1] = 59
                else:
                        # Decrement Minutes
                        self._value[1] -= 1