X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=SleepTimer.py;h=891cd2580fc75eb9475f2850e76157095b8d5756;hp=ea18ceed027d0e1c32e5824de3f5719b05bb264e;hb=1f497d5b863644889bda758eed836a3d6be7be11;hpb=a304ed63ef86c02d1c74b342b619edff642a164b

diff --git a/SleepTimer.py b/SleepTimer.py
index ea18cee..891cd25 100644
--- a/SleepTimer.py
+++ b/SleepTimer.py
@@ -2,14 +2,12 @@ import timer
 import time
 import math
 
-from enigma import quitMainloop
-
 from Tools import Notifications
 
 from Components.config import config, ConfigYesNo, ConfigSelection, ConfigSubsection
 
 from Screens.MessageBox import MessageBox
-from Screens.Standby import Standby
+import Screens.Standby
 
 class SleepTimerEntry(timer.TimerEntry):
 	def __init__(self, begin):
@@ -23,13 +21,13 @@ class SleepTimerEntry(timer.TimerEntry):
 	def activate(self):
 		if self.state == self.StateRunning:
 			if config.SleepTimer.action.value == "shutdown":
-				if config.SleepTimer.ask.value:
-					Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer want's to shut down") + "\n" + _("your Dreambox. Shutdown now?"), timeout = 20)
+				if config.SleepTimer.ask.value and not Screens.Standby.inTryQuitMainloop:
+					Notifications.AddNotificationWithCallback(self.shutdown, MessageBox, _("A sleep timer wants to shut down\nyour Dreambox. Shutdown now?"), timeout = 20)
 				else:
 					self.shutdown(True)
 			elif config.SleepTimer.action.value == "standby":
-				if config.SleepTimer.ask.value:
-					Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer want's to set your") + "\n" + _("Dreambox to standby. Do that now?"), timeout = 20)
+				if config.SleepTimer.ask.value and not Screens.Standby.inStandby:
+					Notifications.AddNotificationWithCallback(self.standby, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20)
 				else:
 					self.standby(True)
 
@@ -40,13 +38,13 @@ class SleepTimerEntry(timer.TimerEntry):
 	
 	def shutdown(self, answer):
 		if answer is not None:
-			if answer:
-				quitMainloop(1)
+			if answer and not Screens.Standby.inTryQuitMainloop:
+				Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1)
 
 	def standby(self, answer):
 		if answer is not None:
-			if answer:
-				Notifications.AddNotification(Standby, self)
+			if answer and not Screens.Standby.inStandby:
+				Notifications.AddNotification(Screens.Standby.Standby)
 		
 class SleepTimer(timer.Timer):
 	def __init__(self):