aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-12-31 16:16:55 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-12-31 16:16:55 +0100
commitc3f347af4ddf3cc52fe3d8e89a361746d1f5067d (patch)
tree298728225b31d2d04b65dc5e6fac57b6ecacec91 /lib
parent80a99b08bd6e0932a420e805d928dc5ae5b80f61 (diff)
parentfd388a500b0c45afb1668ba28758dbc1ea5631b1 (diff)
downloadenigma2-experimental-2011.01.tar.gz
enigma2-experimental-2011.01.zip
Merge branch 'master' into experimentalexperimental-2011.01
Diffstat (limited to 'lib')
-rw-r--r--lib/dvb/epgcache.cpp2
-rw-r--r--lib/service/servicedvb.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 8ac0c718..ed31903c 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -258,7 +258,7 @@ void eEPGCache::timeUpdated()
{
if (it->second->state == -1) {
it->second->state=0;
- messages.send(Message(Message::startChannel, it->second));
+ messages.send(Message(Message::startChannel, it->first));
}
}
} else
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 2889ad30..52286772 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -905,7 +905,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
/* we are sure to have a ..DVB reference as the info() call was forwarded here according to it's ID. */
if ((err = db->getService((eServiceReferenceDVB&)ref, service)) != 0)
{
- eDebug("getService failed!");
+// eDebug("getService failed!");
return err;
}
}