Merge branch 'master' into pu/moviebrowser

Origin commit data
------------------
Branch: ni/coolstream
Commit: 664bd8dcf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


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

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

src/driver/pictureviewer/pictureviewer.cpp

@@ -616,6 +616,11 @@ void CPictureViewer::rescaleImageDimensions(int *width, int *height, const int m
 
 bool CPictureViewer::DisplayImage(const std::string & name, int posx, int posy, int width, int height, int transp)
 {
+	if(width < 1 || height < 1){
+		dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] Error: width %i height %i \n", __func__, __LINE__, width, height);
+		return false;
+	}
+
 	CFrameBuffer* frameBuffer = CFrameBuffer::getInstance();
 	if (transp > CFrameBuffer::TM_EMPTY)
 		frameBuffer->SetTransparent(transp);
@@ -672,6 +677,12 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width,
 		if (load_ret == FH_ERROR_OK)
 		{
 			dprintf(DEBUG_INFO,  "[CPictureViewer] [%s - %d] mode %s, decoded %s, (Pos: %d %d) ,bpp = %d \n", __func__, __LINE__, mode_str.c_str(), name.c_str(), x, y, bpp);
+			// image size error
+			if((GetImage) && (*width < 1 || *height < 1)){
+				dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] mode: %s, file: %s (Pos: %d %d, Dim: %d x %d)\n", __func__, __LINE__, mode_str.c_str(), name.c_str(), x, y, *width, *height);
+				free(buffer);
+				return NULL;
+			}
 			// resize only getImage
 			if ((GetImage) && (x != *width || y != *height))
 			{
@@ -691,6 +702,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width,
 			*height = y;
 		}else{
 			dprintf(DEBUG_NORMAL,  "[CPictureViewer] [%s - %d] mode %s: Error decoding file %s\n", __func__, __LINE__, mode_str.c_str(), name.c_str());
+			free(buffer);
 			return NULL;
 		}
 		free(buffer);

src/gui/components/cc_item_infobox.cpp

@@ -105,8 +105,12 @@ void CComponentsInfoBox::paintPicture()
 	if (pic_name.empty())
 		return;
 
+	//NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item
+	int x_pic = (cc_parent ? cc_xr : x) + fr_thickness;
+	int y_pic = (cc_parent ? cc_yr : y) + fr_thickness;
+
 	//init pic object and set icon paint position
-	pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
+	pic = new CComponentsPicture(x_pic+x_offset, y_pic, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale!
 
 	pic->setColorBody(col_body);
 
@@ -115,7 +119,7 @@ void CComponentsInfoBox::paintPicture()
 		pic->doPaintBg(false);
 
 	//fit icon into frame
-	pic->setYPos(y+(height/2-pic->getHeight()/2));
+	pic->setYPos(y_pic+(height/2-pic->getHeight()/2));
 
 	//paint, but set visibility mode
 	pic->allowPaint(cc_allow_paint);

src/gui/miscsettings_menu.cpp

@@ -569,7 +569,7 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
 	ms_oservices->addItem(youtube_onoff);
 
 	changeNotify(LOCALE_YOUTUBE_DEV_ID, NULL);
-	CKeyboardInput youtube_dev_id_input(LOCALE_YOUTUBE_DEV_ID, &g_settings.youtube_dev_id, 38, this);
+	CKeyboardInput youtube_dev_id_input(LOCALE_YOUTUBE_DEV_ID, &g_settings.youtube_dev_id, 39, this);
 	mf = new CMenuForwarder(LOCALE_YOUTUBE_DEV_ID, true, youtube_dev_id_short, &youtube_dev_id_input);
 	mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_YOUTUBE_DEV_ID);
 	ms_oservices->addItem(mf);

src/timerd/timermanager.cpp

@@ -1306,10 +1306,19 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
 	CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
 
 	time_t now = time(NULL);
+	time_t compare;
+
+	int pre, post;
+	CTimerManager::getInstance()->getRecordingSafety(pre, post);
+
 	CChannelEventList::iterator first = evtlist.end();
 	for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e)
 	{
-		if (e->startTime <  now)
+		compare = e->startTime;
+		if (!pre)
+			compare += e->duration;
+
+		if (compare <= now)
 			continue;
 		if (first == evtlist.end() || first->startTime > e->startTime)
 			first = e;
@@ -1323,8 +1332,6 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
 	time_t _alarmTime = first->startTime;
 	time_t _stopTime = first->startTime + first->duration;
 	if (recordingSafety) {
-		int pre, post;
-		CTimerManager::getInstance()->getRecordingSafety(pre, post);
 		_alarmTime -= pre;
 		_stopTime += post;
 	}