From 1d22fadc6bde6fdc5d90fb59c6793948c7d734c0 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 7 Nov 2016 22:54:53 +0100 Subject: [PATCH 1/2] src/gui/osd_setup.cpp supplement to d2ab0e9c , fix segfault if clock is NULL# Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ddd9bd3ca93fceda374c88766f5ae0cc77fa743c Author: Jacek Jendrzej Date: 2016-11-07 (Mon, 07 Nov 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 14cb560f5d74490f942b3e2084371f4c71f2b233 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 8 Nov 2016 21:48:51 +0100 Subject: [PATCH 2/2] channellist: fix epg for webtv channels Origin commit data ------------------ Branch: ni/coolstream 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 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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)