From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sat, 23 Jan 2010 12:42:37 +0000 (+0100)
Subject: Merge branch 'bug_414_spinner_recording_paths' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=198d166196d8c4b1824be0347bb324890e1cfc5c;hp=7c75162a934f5cb088801396f2b3129d74a119e6

Merge branch 'bug_414_spinner_recording_paths' into experimental
---

diff --git a/lib/python/Screens/RecordPaths.py b/lib/python/Screens/RecordPaths.py
index c833266..22ca9fc 100644
--- a/lib/python/Screens/RecordPaths.py
+++ b/lib/python/Screens/RecordPaths.py
@@ -6,7 +6,7 @@ from Components.config import config, ConfigSelection, getConfigListEntry, confi
 from Components.ConfigList import ConfigListScreen
 from Components.ActionMap import ActionMap
 from Tools.Directories import fileExists
-
+from Components.UsageConfig import preferredPath
 
 class RecordPathsSettings(Screen,ConfigListScreen):
 	skin = """
@@ -115,7 +115,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
 				self.dirnameSelected,
 				MovieLocationBox,
 				txt,
-				self.default_dirname.value
+				preferredPath(self.default_dirname.value)
 			)
 		elif currentry == self.timer_entry:
 			self.entrydirname = self.timer_dirname
@@ -123,7 +123,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
 				self.dirnameSelected,
 				MovieLocationBox,
 				_("Initial location in new timers"),
-				self.timer_dirname.value
+				preferredPath(self.timer_dirname.value)
 			)
 		elif currentry == self.instantrec_entry:
 			self.entrydirname = self.instantrec_dirname
@@ -131,7 +131,7 @@ class RecordPathsSettings(Screen,ConfigListScreen):
 				self.dirnameSelected,
 				MovieLocationBox,
 				_("Location for instant recordings"),
-				self.instantrec_dirname.value
+				preferredPath(self.instantrec_dirname.value)
 			)
 		elif currentry == self.timeshift_entry:
 			self.entrydirname = self.timeshift_dirname