X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FEventView.py;h=4a3967870e76342e4d22673f952d1b2ba3da9736;hp=6aed1e113d88b3fbbe8b2984b8ed662b1429705c;hb=HEAD;hpb=1076e4717bcf0eb93d803f73b2b75a8ae192b143

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index 6aed1e1..4a39678 100644
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -6,6 +6,7 @@ from Components.Button import Button
 from Components.Label import Label
 from Components.ScrollLabel import ScrollLabel
 from Components.TimerList import TimerList
+from Components.UsageConfig import preferredTimerPath
 from enigma import eEPGCache, eTimer, eServiceReference
 from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from TimerEntry import TimerEntry
@@ -20,7 +21,7 @@ class EventViewBase:
 		self.similarEPGCB = similarEPGCB
 		self.cbFunc = callback
 		self.currentService=Ref
-		self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and len(Ref.ref.getPath())
+		self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and Ref.ref.getPath()
 		self.event = Event
 		self["epg_description"] = ScrollLabel()
 		self["datetime"] = Label()
@@ -71,6 +72,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:
@@ -83,7 +86,7 @@ class EventViewBase:
 				self.session.openWithCallback(cb_func, MessageBox, _("Do you really want to delete %s?") % event.getEventName())
 				break
 		else:
-			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, *parseEvent(self.event))
+			newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, dirname = preferredTimerPath(), *parseEvent(self.event))
 			self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry)
 
 	def finishedAdd(self, answer):
@@ -110,7 +113,7 @@ class EventViewBase:
 
 	def setService(self, service):
 		self.currentService=service
-		if self.isRecording:
+		if self.isRecording and (self.currentService.ref.type == eServiceReference.idDVB):
 			self["channel"].setText(_("Recording"))
 		else:
 			name = self.currentService.getServiceName()
@@ -134,12 +137,12 @@ class EventViewBase:
 		text = event.getEventName()
 		short = event.getShortDescription()
 		ext = event.getExtendedDescription()
-		if len(short) > 0 and short != text:
-			text = text + '\n\n' + short
-		if len(ext) > 0:
-			if len(text) > 0:
-				text = text + '\n\n'
-			text = text + ext
+		if short and short != text:
+			text += '\n\n' + short
+		if ext:
+			if text:
+				text += '\n\n'
+			text += ext
 
 		self.setTitle(event.getEventName())
 		self["epg_description"].setText(text)
@@ -189,7 +192,7 @@ class EventViewBase:
 			self["key_red"].setText(_("Similar"))
 
 	def openSimilarList(self):
-		if self.similarEPGCB is not None and len(self["key_red"].getText()):
+		if self.similarEPGCB is not None and self["key_red"].getText():
 			id = self.event and self.event.getEventId()
 			refstr = str(self.currentService)
 			if id is not None: