From f47e0837c061507da062a79167aa763d01cc39b0 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 29 Apr 2017 22:46:06 +0200 Subject: [PATCH 1/2] CChannelList: Ensure new initialize of modules on palette changes while runtime. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1e4967e114bfa5a6a054d062cc5d245cd48219ae Author: Thilo Graf Date: 2017-04-29 (Sat, 29 Apr 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 22abc6782..e03acf7e8 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -132,6 +132,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl channelsChanged = false; paint_events_index = -2; + CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules)); } CChannelList::~CChannelList() From d5bc25ae238916176510bf48c4c67ddfa3480ace Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 2 May 2017 13:08:06 +0200 Subject: [PATCH 2/2] src/gui/upnpbrowser.cpp fix segfault on connect error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cc0f0cd951b7be88bd0d452b3387f3288297cd16 Author: Jacek Jendrzej Date: 2017-05-02 (Tue, 02 May 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/upnpbrowser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 9b6bf89b1..7458db5f7 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -731,7 +731,7 @@ bool CUpnpBrowserGui::selectItem(std::string id) if (!getItems(id, liststart, entries, total)) return endall; - while (loop) { + while (loop && entries!=NULL) { updateTimes(); updateMode();