Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-05-02 13:18:29 +02:00
2 changed files with 2 additions and 1 deletions

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()

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();