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

Origin commit data
------------------
Branch: ni/coolstream
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit

lib/libtuxtxt/tuxtxt.cpp

@@ -58,6 +58,10 @@ fb_pixel_t *getFBp(int *y)
 
 void FillRect(int x, int y, int w, int h, int color)
 {
+	if(color < 0 || SIZECOLTABLE < color){
+		printf("FIXME array size %i color %i not in range\n",SIZECOLTABLE,color);
+		return;
+	}
 	fb_pixel_t *p = getFBp(&y);
 	MARK_FB(x, y, w, h);
 	p += x + y * stride;

src/gui/record_setup.cpp

@@ -318,7 +318,7 @@ int CRecordSetup::showRecordSetup()
 void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
 {
 	//recording start/end correcture
-	int pre,post;
+	int pre = 0,post = 0;
 	g_Timerd->getRecordingSafety(pre,post);
 	g_settings.record_safety_time_before = pre/60;
 	g_settings.record_safety_time_after = post/60;

src/gui/timerlist.cpp

@@ -442,7 +442,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 	}
 	else if ((strcmp(key, "send_remotetimer") == 0) && RemoteBoxChanExists(timerlist[selected].channel_id))
 	{
-		int pre,post;
+		int pre = 0,post = 0;
 		Timer->getRecordingSafety(pre,post);
 		CHTTPTool httpTool;
 		std::string r_url;

src/gui/widget/progresswindow.cpp

@@ -122,6 +122,7 @@ CProgressBar* CProgressWindow::getProgressItem()
 	pBar->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
 	pBar->setFrameThickness(1);
 	pBar->setColorFrame(COL_PROGRESSBAR_ACTIVE_PLUS_0);
+	pBar->setType(CProgressBar::PB_TIMESCALE);
 	addWindowItem(pBar);
 
 	return pBar;

src/timerd/timerd.cpp

@@ -308,7 +308,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
 					CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
 					if(recInfo.recordingSafety)
 					{
-						int pre,post;
+						int pre = 0,post = 0;
 						CTimerManager::getInstance()->getRecordingSafety(pre,post);
 						msgAddTimer.announceTime -= pre;
 						msgAddTimer.alarmTime -= pre;

src/timerd/timermanager.cpp

@@ -1359,7 +1359,7 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
 	CChannelEventList evtlist;
 	CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
 
-	int pre, post;
+	int pre = 0, post = 0;
 	CTimerManager::getInstance()->getRecordingSafety(pre, post);
 
 	time_t _announceTime = announceTime;