X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9f2f71f1f7d1bd21413860ab60296f1c8203e90b..dbb5a31a5ade1387803b4710ea460c7b595d9339:/lib/dvb/db.cpp?ds=sidebyside

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index cf655690..bb29bcca 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -668,11 +668,8 @@ void eDVBDB::loadBouquet(const char *path)
 				e->name = line+offs;
 				read_descr=false;
 			}
-			else if (!strncmp(line, "#NAME ", 6) || !strncmp(line, "#NAME: ", 7))
-			{
-				int offs = line[5] == ':' ? 7 : 6;
-				bouquet.m_bouquet_name=line+offs;
-			}
+			else if (!strncmp(line, "#NAME ", 6))
+				bouquet.m_bouquet_name=line+6;
 			continue;
 		}
 	}
@@ -774,6 +771,8 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
 			if ((unsigned int)sat.orbital_position != orbpos)
 				remove=false;
 		}
+		else if (orbpos != 0xFFFFFFFF) // do not remove -C or -T transponders when a orbital position is given..
+			remove=false;
 		if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
 			remove=false;
 		if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )