X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=1f65038cd73dca936b2ceeffa6ea13b46f0a60b5;hp=fd2da33c58b1ca4d491dc8166ba66f9bc0940242;hb=13705824885aa7f8fb779713eab7d0e5874769a4;hpb=019ba406ed5ba46782951d501ed2d4c0a96e6096

diff --git a/RecordTimer.py b/RecordTimer.py
index fd2da33..1f65038 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -356,8 +356,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
 			if self.dirnameHadToFallback:
 				text = '\n'.join((text, _("Please note that the previously selected media could not be accessed and therefore the default directory is being used instead.")))
 
-			# maybe this should be configurable?
-			Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3)
+			if config.usage.show_message_when_recording_starts.value:
+				Notifications.AddPopup(text = text, type = MessageBox.TYPE_INFO, timeout = 3)
 
 	# we have record_service as property to automatically subscribe to record service events
 	def setRecordService(self, service):
@@ -649,7 +649,7 @@ class RecordTimer(timer.Timer):
 						chktimecmp_end = chktimecmp + (duration / 60)
 					time = localtime(x.begin)
 					for y in (0, 1, 2, 3, 4, 5, 6):
-						if x.repeated & (2 ** y):
+						if x.repeated & (2 ** y) and (x.begin <= begin or begin <= x.begin <= end):
 							timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
 							if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
 								time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60