Merge branch 'master' of /home/tmbinc/enigma2-git

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4cc4063..24d39cb 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1029,6 +1029,13 @@ class ConfigNumber(ConfigText):
        value = property(getValue, setValue)
        _value = property(getValue, setValue)
 
+       def isChanged(self):
+               sv = self.saved_value
+               strv = self.tostring(self.value)
+               if sv is None and strv == self.default:
+                       return False
+               return strv != sv
+
        def conform(self):
                pos = len(self.text) - self.marked_pos
                self.text = self.text.lstrip("0")

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index c55d952..c1ffb58 100644 (file)
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -71,6 +71,8 @@ class EventViewBase:
                self.key_green_choice = self.ADD_TIMER
        
        def timerAdd(self):
+               if self.isRecording:
+                       return
                event = self.event
                serviceref = self.currentService
                if event is None: