aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-10-17 14:09:47 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-10-17 14:09:47 +0200
commit03020757d9906f2b4fb42f61e9b96906185bab52 (patch)
tree7baf5741f23ff34aae3b63614b2f9e6f5bc8bc21
parent983a31577ff10bc1d7ce34a5d49fe4f10aae1fcf (diff)
downloadenigma2-03020757d9906f2b4fb42f61e9b96906185bab52.tar.gz
enigma2-03020757d9906f2b4fb42f61e9b96906185bab52.zip
cleanup grayout handling in servicelist.. so no more grayout in timeout channelselection and other channelselections based on simple channelselection
-rwxr-xr-xlib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py6
-rw-r--r--lib/service/listboxservice.cpp2
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
index 48669c73..2c0edf53 100755
--- a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
@@ -510,12 +510,6 @@ class myChannelSelection(ChannelSelectionBase):
def __init__(self, session, title):
ChannelSelectionBase.__init__(self, session)
self.onShown.append(self.__onExecCallback)
- service = self.session.nav.getCurrentService()
- if service:
- info = service.info()
- if info:
- refstr = info.getInfoString(iServiceInformation.sServiceref)
- self.servicelist.setPlayableIgnoreService(eServiceReference(refstr))
self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions", "ChannelSelectBaseActions"],
{
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index a2c6b8fe..05aaf731 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -528,7 +528,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
eServiceReference ref = *m_cursor;
bool isPlayable = !(ref.flags & eServiceReference::isDirectory || ref.flags & eServiceReference::isMarker);
- if (!marked && isPlayable && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+ if (!marked && isPlayable && service_info && m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
{
if (m_color_set[serviceNotAvail])
painter.setForegroundColor(m_color[serviceNotAvail]);