add some assertions

[enigma2.git] / lib / dvb / db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 39a0d3eefa120ad69514ed9cfaacf85ab266705a..31b70882d4d23fe223e42a5e8ffe96558191f7bf 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -81,7 +81,7 @@ RESULT eBouquet::flushChanges()
        {
                eServiceReference tmp = *i;
                std::string str = tmp.path;
-               if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+               if ( i->flags&eServiceReference::canDescent )
                {
                        unsigned int p1 = str.find("FROM BOUQUET \"");
                        if (p1 == std::string::npos)
@@ -642,7 +642,7 @@ void eDVBDB::loadBouquet(const char *path)
                                        eDebug("only DVB Bouquets supported");
                                        continue;
                                }
-                               if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+                               if ( tmp.flags&eServiceReference::canDescent )
                                {
                                        unsigned int pos = tmp.path.rfind('/');
                                        if ( pos != std::string::npos )
@@ -763,7 +763,7 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
                bool remove=true;
                int system;
                it->second.m_frontendParameters->getSystem(system);
-               if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+               if ( system == iDVBFrontend::feSatellite )
                {
                        eDVBFrontendParametersSatellite sat;
                        it->second.m_frontendParameters->getDVBS(sat);