mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +02:00
Merge branch 'master' into pu/mp
This commit is contained in:
@@ -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()
|
||||||
|
@@ -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();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user