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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
    	src/gui/followscreenings.cpp
This commit is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent c8ad32b1e4 d6cb1d206f
commit 2e8c700dd2
8 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/followscreenings.cpp
View File

@@ -40,7 +40,7 @@
#include <system/helpers.h>
#include <gui/widget/buttons.h>
#include <gui/widget/hintbox.h>
#include <gui/widget/msgbox.h>
#include <gui/widget/icons.h>
#include <gui/timerlist.h>
@@ -66,6 +66,9 @@ CChannelEventList *CFollowScreenings::getFollowScreenings(void)
if (e->description != title)
continue;
followlist.push_back(*e);
if (followlist.size() == 1 && !g_settings.timer_followscreenings)
break;
}
}
return &followlist;
@@ -87,7 +90,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())
if (!forwarders.empty() && followlist.size() > 1)
forwarders[ix]->iconName_Info_right = "";
#if 0
else
@@ -106,13 +109,11 @@ 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())
if (!forwarders.empty() && followlist.size() > 1)
forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_REC;
#if 0
else
ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG,
CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO);
#endif
CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
return menu_return::RETURN_REPAINT;
}
break; // for