diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp index fda6414a7..da958cf80 100644 --- a/src/gui/followscreenings.cpp +++ b/src/gui/followscreenings.cpp @@ -92,7 +92,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK if (i->eventType == CTimerd::TIMER_RECORD) { if (channel_id == i->channel_id && e->startTime == i->epg_starttime) { Timer.removeTimerEvent(i->eventID); - if (!forwarders.empty() && followlist.size() > 1) + if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == 2 /*always*/)) forwarders[ix]->iconName_Info_right = ""; #if 0 else @@ -104,6 +104,8 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK if (!SAME_TRANSPONDER(channel_id, i->channel_id)) { if (!askUserOnTimerConflict(start, stop, channel_id)) return menu_return::RETURN_REPAINT; + else + break; // show conflicts only once } } @@ -111,9 +113,9 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK e->startTime, e->startTime - (ANNOUNCETIME + 120 ), apids, true, e->startTime - (ANNOUNCETIME + 120) > time(NULL), recDir, true) == -1) { //FIXME -- no error handling, but this shouldn't happen ... } else { - if (!forwarders.empty() && followlist.size() > 1) - forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_MARKER_RECORD; - else + if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == 2 /*always*/)) + forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC; + else if (g_settings.timer_followscreenings != 2 /*always*/) ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); return menu_return::RETURN_REPAINT;