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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
	src/gui/timerlist.cpp
This commit is contained in:
Thilo Graf
2016-11-09 00:30:44 +01:00
parent 3e7a1943c3 b59527e987
commit 996beed078
3 changed files with 265 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -2340,7 +2340,7 @@ void CChannelList::paint_events()
int current_index = paint_events_index;
CChannelEventList evtlist;
readEvents((*chanlist)[current_index]->getChannelID(), evtlist);
readEvents((*chanlist)[current_index]->getEpgID(), evtlist);
if (current_index == paint_events_index) {
pthread_mutex_lock(&paint_events_mutex);
if (current_index == paint_events_index)