From d1e313b4f3582a4c29e45eb01131c6dcb3f5e42a Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 7 Nov 2016 19:52:28 +0100 Subject: [PATCH 1/3] fix epgtitle Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/32c6eaf03178dbddf311dae3a92db0d241acef4b Author: TangoCash Date: 2016-11-07 (Mon, 07 Nov 2016) --- src/gui/timerlist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index ce8a84bf9..40628f122 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -835,7 +835,8 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist) rtimer.stopTime = (time_t) atoll(remotetimers[i]["stop"][0].get("digits","").asString().c_str()); rtimer.epgID = (event_id_t) atoi(remotetimers[i].get("epg_id","").asString()); sscanf(remotetimers[i].get("channel_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.channel_id); - strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),51); + strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle)); + rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0; if (remotetimers[i]["audio"].get("apids_conf","").asString() == "true") rtimer.apids = TIMERD_APIDS_CONF; //printf("[remotetimer] r-timer:%s - %s\n", remotetimers[i].get("channel_id","").asString().c_str(), remotetimers[i].get("title","").asString().c_str()); From bf0624760c735044f702aabed4f8bfb73105ac15 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 7 Nov 2016 22:54:53 +0100 Subject: [PATCH 2/3] src/gui/osd_setup.cpp supplement to 7bafa13c , fix segfault if clock is NULL# Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ddd9bd3ca93fceda374c88766f5ae0cc77fa743c Author: Jacek Jendrzej Date: 2016-11-07 (Mon, 07 Nov 2016) --- src/gui/osd_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e14f12de4..27e492ed3 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1390,7 +1390,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist) CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); //using native callback to ensure stop header clock in parent channellist before paint this menu window - if (parent_channellist) + if (parent_channellist && parent_channellist->getHeaderObject()->getClockObject()) menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block)); menu_chanlist->enableSaveScreen(true); From 9a9ffd754bb5eab0f239d4de1e8d3d1c326ecd7e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 8 Nov 2016 21:48:51 +0100 Subject: [PATCH 3/3] channellist: fix epg for webtv channels Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b59527e9873e45133096bc0f496b80d0c420cf7d Author: vanhofen Date: 2016-11-08 (Tue, 08 Nov 2016) Origin message was: ------------------ - channellist: fix epg for webtv channels --- src/gui/channellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index c6c9bafa3..55437a472 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2336,7 +2336,7 @@ void CChannelList::paint_events() int current_index = paint_events_index; CChannelEventList evtlist; - readEvents((*chanlist)[current_index]->getChannelID(), evtlist); + readEvents((*chanlist)[current_index]->getEpgID(), evtlist); if (current_index == paint_events_index) { pthread_mutex_lock(&paint_events_mutex); if (current_index == paint_events_index)