diff options
| author | Johann Friedrichs <johann.friedrichs@web.de> | 2021-05-22 23:36:12 +0200 |
|---|---|---|
| committer | Johann Friedrichs <johann.friedrichs@web.de> | 2021-05-22 23:36:12 +0200 |
| commit | 94c06d9af813483be5ab7708fe81e5fab6e3a7e8 (patch) | |
| tree | 96170c32533b80be7ab29181afe1fb46779dc9cf | |
| parent | 43d7ff0fab23ce678a47a9b2ed3431515beeed25 (diff) | |
| download | vdr-plugin-epgsearch-94c06d9af813483be5ab7708fe81e5fab6e3a7e8.tar.gz vdr-plugin-epgsearch-94c06d9af813483be5ab7708fe81e5fab6e3a7e8.tar.bz2 | |
Fix for VDR-2.5.4
| -rw-r--r-- | epgsearch.c | 1 | ||||
| -rw-r--r-- | menu_searchresults.c | 2 | ||||
| -rw-r--r-- | menu_whatson.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/epgsearch.c b/epgsearch.c index 7c58ddb..0df27a1 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -26,6 +26,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch * */ +#define DISABLE_TEMPLATES_COLLIDING_WITH_STL #include <vector> #include <vdr/plugin.h> #include <vdr/status.h> diff --git a/menu_searchresults.c b/menu_searchresults.c index d4d836c..2bcf8d1 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -181,7 +181,7 @@ void cMenuSearchResultsItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Inde const cChannel *channel = event ? Channels->GetByChannelID(event->ChannelID(), true, true) : NULL; if (!event) DisplayMenu->SetItem(Text(), Index, Current, Selectable); - else if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, true, timerMatch)) + else if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, true, timerMatch, timerActive)) DisplayMenu->SetItem(Text(), Index, Current, Selectable); } diff --git a/menu_whatson.c b/menu_whatson.c index 1b0b117..5768d22 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -235,7 +235,7 @@ bool cMenuMyScheduleItem::Update(const cTimers* Timers, bool Force) void cMenuMyScheduleItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable) { bool withDate = (channel == NULL); // search for a better way to determine this - if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch)) + if (!DisplayMenu->SetItemEvent(event, Index, Current, Selectable, channel, withDate, timerMatch, timerActive)) DisplayMenu->SetItem(Text(), Index, Current, Selectable); } @@ -271,7 +271,7 @@ bool cMenuMyScheduleSepItem::Update(const cTimers *Timers, bool Force) void cMenuMyScheduleSepItem::SetMenuItem(cSkinDisplayMenu *DisplayMenu, int Index, bool Current, bool Selectable) { bool withDate = (channel == NULL); // search for a better way to determine this - if (!DisplayMenu->SetItemEvent(dummyEvent, Index, Current, Selectable, channel, withDate, timerMatch)) + if (!DisplayMenu->SetItemEvent(dummyEvent, Index, Current, Selectable, channel, withDate, timerMatch, timerActive)) DisplayMenu->SetItem(Text(), Index, Current, Selectable); } |