X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=b27df9d319cc80792b433b3262188bb3455b982b;hp=20c069a27a6a4c0a0eeaee56d1e99bc0a5bb4f4d;hb=7560beb3e371704d798259ca1ea927bf4575306c;hpb=56c7e586eea1f129bae06e28ed2a58060386b2cf

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 20c069a..b27df9d 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -10,6 +10,7 @@ from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.Boolean import Boolean
 from Components.config import config, ConfigBoolean, ConfigClock
 from Components.SystemInfo import SystemInfo
+from Components.UsageConfig import preferredInstantRecordPath, defaultMoviePath
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
 
@@ -29,7 +30,7 @@ from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
+from Tools.Directories import fileExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 	iPlayableService, eServiceReference, eEPGCache
@@ -1370,11 +1371,18 @@ class InfoBarSleepTimer:
 # depends on InfoBarExtensions
 class InfoBarPiP:
 	def __init__(self):
-		self.session.pipshown = False
+		try:
+			self.session.pipshown
+		except:
+			self.session.pipshown = False
 		if SystemInfo.get("NumVideoDecoders", 1) > 1:
-			self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue")
-			self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
-			self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+			if (self.allowPiP):
+				self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue")
+				self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
+				self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
+			else:
+				self.addExtension((self.getShowHideName, self.showPiP, self.pipShown), "blue")
+				self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
 
 	def pipShown(self):
 		return self.session.pipshown
@@ -1489,7 +1497,7 @@ class InfoBarInstantRecord:
 		if isinstance(serviceref, eServiceReference):
 			serviceref = ServiceReference(serviceref)
 
-		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value)
+		recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = preferredInstantRecordPath())
 		recording.dontSave = True
 		
 		if event is None or limitEvent == False:
@@ -1590,9 +1598,9 @@ class InfoBarInstantRecord:
 			self.session.nav.RecordTimer.timeChanged(entry)
 
 	def instantRecord(self):
-		dir = config.movielist.last_videodir.value
-		if not fileExists(dir, 'w'):
-			dir = resolveFilename(SCOPE_HDD)
+		dir = preferredInstantRecordPath()
+		if not dir or not fileExists(dir, 'w'):
+			dir = defaultMoviePath()
 		try:
 			stat = os_stat(dir)
 		except: