From 40abde85c0fbd8c10fdc7f8894c128cb8acf05ee Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 2 Feb 2007 15:28:52 +0000
Subject: [PATCH] move getNextRecordingTime to correct place, no more crash
 when try to change a running sleeptimer

---
 RecordTimer.py | 11 +++++++++++
 SleepTimer.py  | 18 +++++++++---------
 timer.py       | 11 -----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/RecordTimer.py b/RecordTimer.py
index 01bb5c72..1e21091d 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -437,6 +437,17 @@ class RecordTimer(timer.Timer):
 			file.write(x)
 		file.close()
 
+	def getNextRecordingTime(self):
+		llen = len(self.timer_list)
+		idx = 0
+		while idx < llen:
+			timer = self.timer_list[idx]
+			if timer.justplay:
+				idx += 1
+			else:
+				return timer.begin
+		return -1
+
 	def record(self, entry):
 		entry.timeChanged()
 		print "[Timer] Record " + str(entry)
diff --git a/SleepTimer.py b/SleepTimer.py
index 891cd258..f9aae1aa 100644
--- a/SleepTimer.py
+++ b/SleepTimer.py
@@ -45,29 +45,29 @@ class SleepTimerEntry(timer.TimerEntry):
 		if answer is not None:
 			if answer and not Screens.Standby.inStandby:
 				Notifications.AddNotification(Screens.Standby.Standby)
-		
+
 class SleepTimer(timer.Timer):
 	def __init__(self):
 		config.SleepTimer = ConfigSubsection()
 		config.SleepTimer.ask = ConfigYesNo(default = True)
 		config.SleepTimer.action = ConfigSelection(default = "shutdown", choices = [("shutdown", _("shutdown")), ("standby", _("standby"))])
-		
 		timer.Timer.__init__(self)
 		self.defaultTime = 30
-		
+
 	def setSleepTime(self, sleeptime):
 		self.clear()
 		self.addTimerEntry(SleepTimerEntry(time.time() + 60 * sleeptime))
 
 	def clear(self):
 		self.timer_list = []
-		
+
 	def getCurrentSleepTime(self):
-		if (self.getNextRecordingTime() == -1):
-			return self.defaultTime
-		return int(math.ceil((self.getNextRecordingTime() - time.time()) / 60))
+		llen = len(self.timer_list)
+		idx = 0
+		while idx < llen:
+			timer = self.timer_list[idx]
+			return int(math.ceil((timer.begin - time.time()) / 60))
+		return self.defaultTime
 
 	def isActive(self):
 		return len(self.timer_list) > 0
-	
-	
\ No newline at end of file
diff --git a/timer.py b/timer.py
index 5c664bbe..35116948 100644
--- a/timer.py
+++ b/timer.py
@@ -134,17 +134,6 @@ class Timer:
 		for f in self.on_state_change:
 			f(entry)
 
-	def getNextRecordingTime(self):
-		llen = len(self.timer_list)
-		idx = 0
-		while idx < llen:
-			timer = self.timer_list[idx]
-			if timer.justplay:
-				idx += 1
-			else:
-				return timer.begin
-		return -1
-
 	def cleanup(self):
 		self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
 	
-- 
2.30.2