mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

followscreenings.cpp: Fix option "always"

Browse Source
This commit is contained in:
FlatTV
2016-12-04 12:03:03 +01:00
committed by Thilo Graf
parent 9760861df5
commit 67b4fec5a6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/followscreenings.cpp
View File

@@ -92,7 +92,7 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
if (i->eventType == CTimerd::TIMER_RECORD) { if (i->eventType == CTimerd::TIMER_RECORD) {
if (channel_id == i->channel_id && e->startTime == i->epg_starttime) { if (channel_id == i->channel_id && e->startTime == i->epg_starttime) {
Timer.removeTimerEvent(i->eventID); 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 = ""; forwarders[ix]->iconName_Info_right = "";
#if 0 #if 0
else else
@@ -104,6 +104,8 @@ int CFollowScreenings::exec(CMenuTarget* /*parent*/, const std::string & actionK
if (!SAME_TRANSPONDER(channel_id, i->channel_id)) { if (!SAME_TRANSPONDER(channel_id, i->channel_id)) {
if (!askUserOnTimerConflict(start, stop, channel_id)) if (!askUserOnTimerConflict(start, stop, channel_id))
return menu_return::RETURN_REPAINT; 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) { 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 ... //FIXME -- no error handling, but this shouldn't happen ...
} else { } else {
if (!forwarders.empty() && followlist.size() > 1) if (!forwarders.empty() && (followlist.size() > 1 || g_settings.timer_followscreenings == 2 /*always*/))
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_MARKER_RECORD; forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
else else if (g_settings.timer_followscreenings != 2 /*always*/)
ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG,
CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;