X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=e7f71daf7766c5ee1f572e5dea7e36e3e7ef9c0f;hp=31a9d5a98ef20785b957ccfd5c4ef26fd9adb852;hb=04f4636324ab06c5a3a4f618100048e159eaf6f9;hpb=b92bc5134f26ded1a6c1de63b0ac6e403c8d7362

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 31a9d5a..e7f71da 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1356,7 +1356,7 @@ class InfoBarPiP:
 		elif "stop" == use:
 			self.showPiP()
 
-from RecordTimer import parseEvent
+from RecordTimer import parseEvent, RecordTimerEntry
 
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to
@@ -1406,10 +1406,14 @@ class InfoBarInstantRecord:
 			if limitEvent:
 				self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO)
 
-		data = (begin, end, name, description, eventid)
+		# TODO: needed?
+		if isinstance(serviceref, eServiceReference):
+			serviceref = ServiceReference(serviceref)
 
-		recording = self.session.nav.recordWithTimer(serviceref, *data)
+		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
 		recording.dontSave = True
+
+		self.session.nav.RecordTimer.record(recording)
 		self.recording.append(recording)
 
 	def isInstantRecordRunning(self):
@@ -1670,7 +1674,7 @@ class InfoBarSubserviceSelection:
 				tlist.append((i.getName(), i))
 
 			if self.bouquets and len(self.bouquets):
-				keys = ["red", "green", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
+				keys = ["red", "blue", "",  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n
 				if config.usage.multibouquet.value:
 					tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist
 				else: