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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-08 22:05:31 +01:00
parent ea9e977f03 14cb560f5d
commit 7c4080e761
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

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

2
src/gui/osd_setup.cpp
View File

@@ -1525,7 +1525,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget * menu_chanlist = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
//using native callback to ensure stop header clock in parent channellist before paint this menu window //using native callback to ensure stop header clock in parent channellist before paint this menu window
if (parent_channellist) if (parent_channellist && parent_channellist->getHeaderObject()->getClockObject())
menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block)); menu_chanlist->OnBeforePaint.connect(sigc::mem_fun(parent_channellist->getHeaderObject()->getClockObject(), &CComponentsFrmClock::block));
menu_chanlist->enableSaveScreen(true); menu_chanlist->enableSaveScreen(true);