fix epgview channelogo (from moviebrowser)

This commit is contained in:
TangoCash
2016-08-09 18:39:07 +02:00
committed by svenhoefer
parent c0f3e908ff
commit 0040a21293

View File

@@ -700,14 +700,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
int logo_w = 0; int logo_w = 0;
int logo_h = 0; int logo_h = 0;
int logo_w_max = ox / 4; int logo_w_max = ox / 4;
if(channel) { if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, g_Zapit->getChannelName(channel_id), lname, &logo_w, &logo_h)) {
if(g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, channel->getName(), lname, &logo_w, &logo_h)) {
if((logo_h > (toph-4)) || (logo_w > logo_w_max)) { if((logo_h > (toph-4)) || (logo_w > logo_w_max)) {
g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4); g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4);
} }
pic_offx = logo_w + 10; pic_offx = logo_w + 10;
} }
}
int pos; int pos;
std::string text1 = epgData.title; std::string text1 = epgData.title;