X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/640a60618e00639f02c546f021ba67c454a49428..6e68543591be09859bbaa4c19e0065e65d8acfe3:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9d257858..3a735dec 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -31,7 +31,7 @@ from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 	iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache
@@ -62,7 +62,7 @@ class InfoBarShowHide:
 				"hide": self.hide,
 			}, 1) # lower prio to make it possible to override ok and cancel..
 
-		self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
+		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
 				iPlayableService.evStart: self.serviceStarted,
 			})
@@ -730,14 +730,14 @@ class InfoBarSeek:
 		return True
 
 	def __seekableStatusChanged(self):
-		print "seekable status changed!"
+#		print "seekable status changed!"
 		if not self.isSeekable():
 			self["SeekActions"].setEnabled(False)
-			print "not seekable, return to play"
+#			print "not seekable, return to play"
 			self.setSeekState(self.SEEK_STATE_PLAY)
 		else:
 			self["SeekActions"].setEnabled(True)
-			print "seekable"
+#			print "seekable"
 
 	def __serviceStarted(self):
 		self.seekstate = self.SEEK_STATE_PLAY
@@ -1170,8 +1170,8 @@ class InfoBarTimeshift:
 	def __seekableStatusChanged(self):
 		enabled = False
 
-		print "self.isSeekable", self.isSeekable()
-		print "self.timeshift_enabled", self.timeshift_enabled
+#		print "self.isSeekable", self.isSeekable()
+#		print "self.timeshift_enabled", self.timeshift_enabled
 
 		# when this service is not seekable, but timeshift
 		# is enabled, this means we can activate
@@ -1179,7 +1179,7 @@ class InfoBarTimeshift:
 		if not self.isSeekable() and self.timeshift_enabled:
 			enabled = True
 
-		print "timeshift activate:", enabled
+#		print "timeshift activate:", enabled
 		self["TimeshiftActivateActions"].setEnabled(enabled)
 
 	def __serviceStarted(self):
@@ -1487,9 +1487,13 @@ class InfoBarInstantRecord:
 			self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
 	def instantRecord(self):
+		dir = config.movielist.last_videodir.value
+		if not pathExists(dir):
+			dir = resolveFilename(SCOPE_HDD)
 		try:
-			stat = os_stat(resolveFilename(SCOPE_HDD))
+			stat = os_stat(dir)
 		except:
+			# XXX: this message is a little odd as we might be recording to a remote device
 			self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR)
 			return