Merge branch 'master' into pu/mp

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

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