From 9abb0c861da35e52b34e793c78e11f7e5fc61e0a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 19 Jan 2018 19:47:41 +0100 Subject: [PATCH] epgview: fix logic for followscreenings- and tmdb-button Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/92b6731e591e88c43d85476ab5c5985c7a9eaa2e Author: vanhofen Date: 2018-01-19 (Fri, 19 Jan 2018) Origin message was: ------------------ - epgview: fix logic for followscreenings- and tmdb-button ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index d3bf7e9db..67e4711e1 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1627,28 +1627,27 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info) if (mp_info) { - if (!g_settings.tmdb_enabled) - { - // disable tmdb button - EpgButtons[MP_BUTTONS][2].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; - } + // check tmdb button + if (g_settings.tmdb_enabled) + EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_0; + else + EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; ::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h); } else { - bool fscr = (has_follow_screenings && !call_fromfollowlist); - if (!fscr) - { - // disable followscreenings button + // check followscreenings button + if (has_follow_screenings && !call_fromfollowlist) + EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_BLUE; + else EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; - } - if (!g_settings.tmdb_enabled) - { - // disable tmdb button + // check tmdb button + if (g_settings.tmdb_enabled) + EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_0; + else EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; - } if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2);