summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY.h7
-rw-r--r--update.c16
2 files changed, 18 insertions, 5 deletions
diff --git a/HISTORY.h b/HISTORY.h
index ab021e1..17c12f8 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
*
*/
-#define _VERSION "1.1.113"
-#define VERSION_DATE "23.03.2020"
+#define _VERSION "1.1.114"
+#define VERSION_DATE "13.08.2020"
#define DB_API 7
@@ -19,6 +19,9 @@
/*
* ------------------------------------
+2020-08-13: version 1.1.114 (horchi)
+ - bugfix: Fixed missing images after restart
+
2020-03-23: version 1.1.113 (horchi)
- change: Minor change of log message
diff --git a/update.c b/update.c
index ee2d5d0..c770e7b 100644
--- a/update.c
+++ b/update.c
@@ -99,7 +99,7 @@ cUpdate::cUpdate(cPluginEPG2VDR* aPlugin)
fullreload = no;
epgdBusy = yes;
epgdState = cEpgdState::esUnknown;
- mainActPending = no;
+ mainActPending = yes;
eventsPending = no;
nextEpgdUpdateAt = 0;
@@ -2024,7 +2024,6 @@ int cUpdate::cleanupPictures()
DIR* dir {nullptr};
char* pdir {nullptr};
int iCount {0};
- int lCount {0};
imageRefDb->countWhere("", iCount);
@@ -2110,8 +2109,13 @@ int cUpdate::cleanupPictures()
if (!dbConnected(yes))
return fail;
+ useeventsDb->clear();
+
for (int res = selectAllEvents->find(); res; res = selectAllEvents->fetch())
+ {
useIds.insert(useeventsDb->getIntValue("USEID"));
+ // tell(0, "DEBUG: insert useid '%ld'", useeventsDb->getIntValue("USEID"));
+ }
selectAllEvents->freeResult();
}
@@ -2122,13 +2126,17 @@ int cUpdate::cleanupPictures()
return done;
}
+ int lCount {0};
+
+ // loop over all symlinks
+
while ((dirent = readdir(dir)))
{
asprintf(&pdir, "%s/%s", epgimagedir, dirent->d_name);
if (isLink(pdir))
{
- if (fullreload || !fileExists(pdir))
+ if (fullreload)
{
if (!removeFile(pdir))
lCount++;
@@ -2136,6 +2144,8 @@ int cUpdate::cleanupPictures()
else if (useIds.count(atoi(dirent->d_name)) == 0)
{
+ // tell(0, "DEBUG: remove link of unused useid '%d'", atoi(dirent->d_name));
+
if (!removeFile(pdir))
lCount++;
}