diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-04-06 18:22:24 +0200 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-04-07 12:56:53 +0200 |
| commit | 6f7042d41f74f6ffc443f04cfffda0440b429da4 (patch) | |
| tree | 75c27b2dabe696756914b8110e7428e03fdc46a2 /channelcolumn.c | |
| parent | 9009f4f385f949f7337d0044efc32a69a0f558c9 (diff) | |
| download | vdr-plugin-tvguide-6f7042d41f74f6ffc443f04cfffda0440b429da4.tar.gz vdr-plugin-tvguide-6f7042d41f74f6ffc443f04cfffda0440b429da4.tar.bz2 | |
Correct an error with the recording sign in grid
Diffstat (limited to 'channelcolumn.c')
| -rw-r--r-- | channelcolumn.c | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/channelcolumn.c b/channelcolumn.c index 459411d..94cb802 100644 --- a/channelcolumn.c +++ b/channelcolumn.c @@ -5,21 +5,11 @@ cChannelColumn::cChannelColumn(int num, const cChannel *channel, cMyTime *myTime this->channel = channel; this->num = num; this->myTime = myTime; -#if VDRVERSNUM >= 20301 - hasTimer = false; - const cSchedule *Schedule = NULL; - LOCK_SCHEDULES_READ; - const cSchedules* schedules = Schedules; - if (schedules) { - Schedule = schedules->GetSchedule(channel); - hasTimer = Schedule ? Schedule->HasTimer() : false; - } -#else +#if VDRVERSNUM < 20301 hasTimer = channel->HasTimer(); #endif hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); -#if VDRVERSNUM >= 20301 -#else +#if VDRVERSNUM < 20301 schedulesLock = new cSchedulesLock(false, 100); #endif header = NULL; @@ -29,8 +19,7 @@ cChannelColumn::~cChannelColumn(void) { if (header) delete header; grids.Clear(); -#if VDRVERSNUM >= 20301 -#else +#if VDRVERSNUM < 20301 delete schedulesLock; #endif } @@ -383,25 +372,14 @@ cGrid *cChannelColumn::addDummyGrid(time_t start, time_t end, cGrid *firstGrid, } void cChannelColumn::SetTimers() { -#if VDRVERSNUM >= 20301 - hasTimer = false; - const cSchedule *Schedule = NULL; - { - LOCK_SCHEDULES_READ; - const cSchedules* schedules = Schedules; - if (schedules) { - Schedule = schedules->GetSchedule(channel); - hasTimer = Schedule ? Schedule->HasTimer() : false; - } - } -#else +#if VDRVERSNUM < 20301 hasTimer = channel->HasTimer(); #endif hasSwitchTimer = SwitchTimers.ChannelInSwitchList(channel); for (cGrid *grid = grids.First(); grid; grid = grids.Next(grid)) { bool gridHadTimer = grid->HasTimer(); grid->SetTimer(); - if (gridHadTimer != grid->HasTimer()) + if (gridHadTimer || gridHadTimer != grid->HasTimer()) grid->SetDirty(); bool gridHadSwitchTimer = grid->HasSwitchTimer(); grid->SetSwitchTimer(); |