X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/88b281557a05fb785a42274bf0f3bc328f9eebfd..718ab3c10238548b0daf968ee35867d5008b1a4a:/lib/python/Screens/InfoBarGenerics.py?ds=sidebyside

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 197594fd..9e0e50af 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -29,7 +29,7 @@ from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
+from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 	iPlayableService, eServiceReference, eEPGCache
@@ -1024,7 +1024,13 @@ class InfoBarPVRState:
 	def __playStateChanged(self, state):
 		playstateString = state[3]
 		self.pvrStateDialog["state"].setText(playstateString)
-		self._mayShow()
+		
+		# if we return into "PLAY" state, ensure that the dialog gets hidden if there will be no infobar displayed
+		if not config.usage.show_infobar_on_skip.value and self.seekstate == self.SEEK_STATE_PLAY:
+			self.pvrStateDialog.hide()
+		else:
+			self._mayShow()
+			
 
 class InfoBarTimeshiftState(InfoBarPVRState):
 	def __init__(self):
@@ -1548,7 +1554,7 @@ class InfoBarInstantRecord:
 
 	def instantRecord(self):
 		dir = config.movielist.last_videodir.value
-		if not pathExists(dir):
+		if not fileExists(dir, 'w'):
 			dir = resolveFilename(SCOPE_HDD)
 		try:
 			stat = os_stat(dir)
@@ -1560,21 +1566,21 @@ class InfoBarInstantRecord:
 		if self.isInstantRecordRunning():
 			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
 				title=_("A recording is currently running.\nWhat do you want to do?"), \
-				list=[(_("stop recording"), "stop"), \
-				(_("change recording (duration)"), "changeduration"), \
-				(_("change recording (endtime)"), "changeendtime"), \
-				(_("add recording (indefinitely)"), "indefinitely"), \
-				(_("add recording (stop after current event)"), "event"), \
+				list=[(_("add recording (stop after current event)"), "event"), \
 				(_("add recording (enter recording duration)"), "manualduration"), \
 				(_("add recording (enter recording endtime)"), "manualendtime"), \
+				(_("add recording (indefinitely)"), "indefinitely"), \
+				(_("change recording (duration)"), "changeduration"), \
+				(_("change recording (endtime)"), "changeendtime"), \
+				(_("stop recording"), "stop"), \
 				(_("do nothing"), "no")])
 		else:
 			self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \
 				title=_("Start recording?"), \
-				list=[(_("add recording (indefinitely)"), "indefinitely"), \
-				(_("add recording (stop after current event)"), "event"), \
+				list=[(_("add recording (stop after current event)"), "event"), \
 				(_("add recording (enter recording duration)"), "manualduration"), \
 				(_("add recording (enter recording endtime)"), "manualendtime"), \
+				(_("add recording (indefinitely)"), "indefinitely"), \
 				(_("don't record"), "no")])
 
 from Tools.ISO639 import LanguageCodes