git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_736_fix_rotor_with_unicable_lnb'
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index 47b5427eca1c65933d68845c499c0323d82ea059..0547407132b3b9e765e83d4314b63cb89095398b 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-615,17
+615,16
@@
void eDVBDB::loadBouquet(const char *path)
p+=path;
eDebug("loading bouquet... %s", p.c_str());
FILE *fp=fopen(p.c_str(), "rt");
p+=path;
eDebug("loading bouquet... %s", p.c_str());
FILE *fp=fopen(p.c_str(), "rt");
- int entries=0;
if (!fp)
{
eDebug("can't open %s: %m", p.c_str());
if (!fp)
{
eDebug("can't open %s: %m", p.c_str());
- if (
strstr(path, "bouquets.tv")
)
+ if (
!strcmp(path, "bouquets.tv")
)
{
eDebug("recreate bouquets.tv");
bouquet.m_bouquet_name="Bouquets (TV)";
bouquet.flushChanges();
}
{
eDebug("recreate bouquets.tv");
bouquet.m_bouquet_name="Bouquets (TV)";
bouquet.flushChanges();
}
- else if (
strstr(path, "bouquets.radio")
)
+ else if (
!strcmp(path, "bouquets.radio")
)
{
eDebug("recreate bouquets.radio");
bouquet.m_bouquet_name="Bouquets (Radio)";
{
eDebug("recreate bouquets.radio");
bouquet.m_bouquet_name="Bouquets (Radio)";
@@
-633,6
+632,7
@@
void eDVBDB::loadBouquet(const char *path)
}
return;
}
}
return;
}
+ int entries=0;
char line[256];
bool read_descr=false;
eServiceReference *e = NULL;
char line[256];
bool read_descr=false;
eServiceReference *e = NULL;