diff options
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/TimerEdit.py | 2 | ||||
| -rw-r--r-- | lib/python/Screens/__init__.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index dbf3f1b5..5532dc83 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -199,7 +199,7 @@ class TimerSanityConflict(Screen): if len(timer) > 1: self["timer2"] = TimerList(self.getTimerList(timer[1])) else: - self["timer2"] = Button("No conflict") + self["timer2"] = TimerList([]) self.list = [] count = 0 diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py index 6e57497a..0780cedf 100644 --- a/lib/python/Screens/__init__.py +++ b/lib/python/Screens/__init__.py @@ -6,4 +6,5 @@ __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu", "EpgSelection", "EventView", "Standby", "ServiceInfo", "InfoBarGenerics", "HelpMenu", "Wizard", "PiPSetup", "PVRState", "Console", "InputBox", "ChoiceBox", "SimpleSummary", - "TimerSelection", "SubservicesQuickzap", "ParentalControlSetup" ] + "TimerSelection", "SubservicesQuickzap", "ParentalControlSetup", + "SleepTimerEdit" ] |