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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-29 15:41:18 +01:00
parent fbbf3890ee c115466fba
commit 71ab60d980
11 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/channellist.cpp
View File

@@ -2074,7 +2074,6 @@ void CChannelList::paintHead()
}
header->setDimensionsAll(x, y, full_width, theight);
header->enableGradientBgCleanUp();
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
header->setIcon(NEUTRINO_ICON_LOCK);