diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2021-04-10 11:32:50 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2021-04-10 11:32:50 +0200 |
commit | 65aafacd8e6e9e3948bbd94f9bcc1720afbfb5b4 (patch) | |
tree | e486ba6d5f2180e3080f260e819590a321efa0b8 /vdr.c | |
parent | ebd92dcd310e8fa1381e8e6488657aca7d92f547 (diff) | |
download | vdr-65aafacd8e6e9e3948bbd94f9bcc1720afbfb5b4.tar.gz vdr-65aafacd8e6e9e3948bbd94f9bcc1720afbfb5b4.tar.bz2 |
Now adjusting spawned timers before setting events to timers
Diffstat (limited to 'vdr.c')
-rw-r--r-- | vdr.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 5.3 2021/04/06 10:00:27 kls Exp $ + * $Id: vdr.c 5.4 2021/04/10 11:32:50 kls Exp $ */ #include <getopt.h> @@ -1107,10 +1107,14 @@ int main(int argc, char *argv[]) bool TimersModified = false; if (const cSchedules *Schedules = cSchedules::GetSchedulesRead(SchedulesStateKey)) { Timers->SetSyncStateKey(StateKeySVDRPRemoteTimersPoll); // setting events shall not trigger a remote timer poll... + if (Timers->AdjustSpawnedTimers()) { // must do this *before* SetEvents()! + StateKeySVDRPRemoteTimersPoll.Reset(); // ...but adjusting spawned timers... + TimersModified = true; + } if (Timers->SetEvents(Schedules)) TimersModified = true; - if (Timers->SpawnPatternTimers(Schedules) | Timers->AdjustSpawnedTimers()) { // this really is '|', not '||'! - StateKeySVDRPRemoteTimersPoll.Reset(); // ...but spawning new timers or adjusting spawned timers must! + if (Timers->SpawnPatternTimers(Schedules)) { + StateKeySVDRPRemoteTimersPoll.Reset(); // ...or spawning new timers must! TimersModified = true; } SchedulesStateKey.Remove(); |