From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 25 Mar 2011 15:30:22 +0000 (+0100)
Subject: db: remove recursive loading of lamedb
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f45ad930a1f328f880def7e4caa5f48e76c3392f

db: remove recursive loading of lamedb
---

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 522035eb..ccaecd4f 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -325,19 +325,11 @@ void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
 	FILE *f=fopen(file, "rt");
-	if (!f && strcmp(file, eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()) == 0)
-	{
-		struct stat s;
-		if ( !stat("lamedb", &s) )
-		{
-			if ( !stat(eEnv::resolve("${sysconfdir}/enigma2").c_str(), &s) )
-			{
-				rename("lamedb", eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
-				reloadServicelist();
-			}
-		}
+	if (!f) {
+		eDebug("can't open %s: %m", file);
 		return;
 	}
+
 	char line[256];
 	int version=3;
 	if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)