mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
Merge branch 'master' into pu/mp
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:
@@ -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()
|
||||
|
@@ -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();
|
||||
|
||||
|
Reference in New Issue
Block a user