- if xml element e2location returns "None", set default-value to /hdd/movie/

- changed xml element name e2dirname to e2location in E2 Timerlist

diff --git a/partnerbox/src/PartnerboxFunctions.py b/partnerbox/src/PartnerboxFunctions.py
index 9c02138..949e585 100644 (file)
--- a/partnerbox/src/PartnerboxFunctions.py
+++ b/partnerbox/src/PartnerboxFunctions.py
@@ -174,7 +174,7 @@ def FillE2TimerList(xmlstring, sreference = None):
                                justplay = justplay,
                                eventId = eventId,
                                afterevent = afterevent,
-                               dirname = str(timer.findtext("e2dirname", '').encode("utf-8", 'ignore')),
+                               dirname = str(timer.findtext("e2location", '').encode("utf-8", 'ignore')),
                                description = str(timer.findtext("e2description", '').encode("utf-8", 'ignore')),
                                type = 0))
        return E2TimerList

diff --git a/partnerbox/src/RemoteTimerEntry.py b/partnerbox/src/RemoteTimerEntry.py
index 43169ef..30339ad 100644 (file)
--- a/partnerbox/src/RemoteTimerEntry.py
+++ b/partnerbox/src/RemoteTimerEntry.py
@@ -137,6 +137,7 @@ class RemoteTimerEntry(Screen, ConfigListScreen):
                self.timerentry_endtime = ConfigClock(default = end)
                if self.timer.type == 0:
                        default = self.timer.dirname
+                       if default == "None": default = "/hdd/movie/"
                        if default not in self.Locations:
                                self.Locations.append(default)
                        self.timerentry_dirname = ConfigSelection(default = default, choices = self.Locations)