X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e21cff679bb73bce310e877d5219ec29291dbe10..f4e60c14b94fe0155aba9addc908a0b2860b3cd8:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 381720e7..1f65038c 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -186,7 +186,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 
 			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
 			if prep_res:
-				if prep_rest == 255:
+				if prep_res == 255:
 					self.log(4, "failed to write meta information")
 				else:
 					self.log(2, "'prepare' failed: error %d" % prep_res)
@@ -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