mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74c0b58e71
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-02 (Tue, 02 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-05-02 13:18:29 +02:00
parent 88d1e42c45 d5bc25ae23
commit 1722b14a6b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/channellist.cpp
View File

@@ -132,6 +132,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
channelsChanged = false; channelsChanged = false;
paint_events_index = -2; paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
} }
CChannelList::~CChannelList() CChannelList::~CChannelList()

2
src/gui/upnpbrowser.cpp
View File

@@ -731,7 +731,7 @@ bool CUpnpBrowserGui::selectItem(std::string id)
if (!getItems(id, liststart, entries, total)) if (!getItems(id, liststart, entries, total))
return endall; return endall;
while (loop) { while (loop && entries!=NULL) {
updateTimes(); updateTimes();
updateMode(); updateMode();