mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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 
Conflicts:
	configure.ac
	src/gui/screensaver.cpp
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: 0cfb59b4bd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-31 (Tue, 31 Jan 2017)
This commit is contained in:
vanhofen
2017-01-31 16:48:40 +01:00
parent 07d4f472a6 04cec1bdf4
commit 550611ef8c
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_item_picture.cpp
View File

@@ -386,6 +386,8 @@ CComponentsChannelLogo::CComponentsChannelLogo( const int &x_pos, const int &y_p
void CComponentsChannelLogo::init(const uint64_t& channelId, const std::string& channelName, bool allow_scale)
{
channel_name = "";
channel_id = 0;
alt_pic_name = "";
setChannel(channelId, channelName);
do_scale = allow_scale;