cleanup grayout handling in servicelist.. so no more grayout in timeout channelselect...

diff --git a/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
index 48669c7392afd4299091baa214f16abda4af2ac4..2c0edf539452155c59793ca1216fb64c54208d53 100755 (executable)
--- 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)
        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"],
                        {
 
                self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions", "ChannelSelectBaseActions"],
                        {

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index a2c6b8fedd3e6a7f100cb5bf61c8611902608edc..05aaf73148bbaed3857ddf005f112f406817c912 100644 (file)
--- 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);
 
                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]);
                {
                        if (m_color_set[serviceNotAvail])
                                painter.setForegroundColor(m_color[serviceNotAvail]);