fixed bug that EPGSearch Favorites Menu was not displayed correctly

This commit is contained in:
louis
2015-01-10 10:10:31 +01:00
parent abcb357b25
commit 74febbfe86
15 changed files with 98 additions and 18 deletions

View File

@@ -599,6 +599,7 @@ void cDisplayMenuMainView::DrawCustomTokens(void) {
cDisplayMenuSchedulesView::cDisplayMenuSchedulesView(cTemplateView *tmplView, eMenuCategory menuCat, bool menuInit) : cDisplayMenuView(tmplView, menuInit) {
cat = menuCat;
channel = NULL;
isEpgSearchFavoritesMenu = false;
}
cDisplayMenuSchedulesView::~cDisplayMenuSchedulesView() {
@@ -614,9 +615,10 @@ bool cDisplayMenuSchedulesView::DrawHeader(void) {
map < string, string > stringTokens;
map < string, int > intTokens;
intTokens.insert(pair<string,int>("whatson", (cat == mcSchedule) ? true: false));
intTokens.insert(pair<string,int>("whatson", (cat == mcSchedule)&&(!isEpgSearchFavoritesMenu) ? true: false));
intTokens.insert(pair<string,int>("whatsonnow", (cat == mcScheduleNow) ? true: false));
intTokens.insert(pair<string,int>("whatsonnext", (cat == mcScheduleNext) ? true: false));
intTokens.insert(pair<string,int>("whatsonfavorites", isEpgSearchFavoritesMenu ? true: false));
stringTokens.insert(pair<string,string>("title", menuTitle));
stringTokens.insert(pair<string,string>("vdrversion", VDRVERSION));