From 6accbdd431ad2e2e4d7b1568840f7566e36e024d Mon Sep 17 00:00:00 2001 From: horchi Date: Tue, 18 Aug 2020 18:13:15 +0200 Subject: 2020-08-18: version 1.1.117 (horchi)\n - addeed: compatibility to VDRs peering feature\n\n --- HISTORY.h | 7 +++++-- status.c | 3 +++ timer.c | 6 ++++++ ttools.c | 5 +++++ update.c | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index 2cbfbba..1215221 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.116" -#define VERSION_DATE "17.08.2020" +#define _VERSION "1.1.117" +#define VERSION_DATE "18.08.2020" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2020-08-18: version 1.1.117 (horchi) + - addeed: compatibility to VDRs peering feature + 2020-08-17: version 1.1.116 (horchi, patch by kfb77) - change: Improved match of series diff --git a/status.c b/status.c index a5af0df..15fa8f3 100644 --- a/status.c +++ b/status.c @@ -163,6 +163,9 @@ int cUpdate::performRecordingActions() { for (const cTimer* ti = timers->First(); ti; ti = timers->Next(ti)) { + if (!ti->Local()) + continue; + if (ti->Recording()) // timer nimmt gerade auf { cRunningRecording* recording = 0; diff --git a/timer.c b/timer.c index 6f20e48..0301723 100644 --- a/timer.c +++ b/timer.c @@ -649,6 +649,9 @@ int cUpdate::updateTimerTable() for (const cTimer* t = timers->First(); t; t = timers->Next(t)) { + if (!t->Local()) + continue; + int timerid = getTimerIdOf(t); // compare by timerid @@ -709,6 +712,9 @@ int cUpdate::updateTimerTable() int insert = yes; int timerId = getTimerIdOf(t); + if (!t->Local()) + continue; + // no timer id or not in table -> handle as insert! timerDb->clear(); diff --git a/ttools.c b/ttools.c index 25b2fdb..db2cf0f 100644 --- a/ttools.c +++ b/ttools.c @@ -253,8 +253,13 @@ int setTimerId(cTimer* timer, int tid) cTimer* getTimerById(cTimers* timers, int timerid) { for (cTimer* t = timers->First(); t; t = timers->Next(t)) + { + if (!t->Local()) + continue; + if (timerid == getTimerIdOf(t)) return t; + } return 0; } diff --git a/update.c b/update.c index bd67674..c41e801 100644 --- a/update.c +++ b/update.c @@ -1694,8 +1694,13 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries) if (event->HasTimer()) { for (timer = timers->First(); timer; timer = timers->Next(timer)) + { + if (!timer->Local()) + continue; + if (timer->Event() == event) break; + } } if (timer) -- cgit v1.2.3