From: Felix Domke <tmbinc@elitedvb.net>
Date: Wed, 11 Mar 2009 07:06:28 +0000 (+0100)
Subject: Merge branch 'master' of /home/tmbinc/enigma2-git
X-Git-Tag: 2.6.0~377^2~1
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1eae3427009157fd382ca360f8d89593225272c8?hp=4fc2a70eeb86fa51b783b4a9c034b926db0013a3

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

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4cc40633..24d39cba 100755
--- 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 c55d9527..c1ffb585 100644
--- 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: