Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)

src/gui/components/cc_detailsline.cpp

@@ -91,8 +91,6 @@ void CComponentsDetailLine::paint(bool do_save_bg)
 	//NI
 	if (!g_settings.show_menu_hints_line) return;
 
-	cc_save_bg = do_save_bg;
-
 	hide();
 	if (hasChanges())
 		clearFbData();

src/gui/components/cc_item_picture.cpp

@@ -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;