mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- addition 2 to rev.1465

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1468 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-05-12 19:35:04 +00:00
parent f0ddec1e45
commit 50d969f521
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/infoviewer.cpp
View File

@@ -655,10 +655,11 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
int ChanNumWidth = 0; int ChanNumWidth = 0;
int ChannelLogoMode = 0; int ChannelLogoMode = 0;
bool logo_ok = false;
if (ChanNum) /* !fileplay */ if (ChanNum) /* !fileplay */
{ {
ChannelLogoMode = showChannelLogo(channel_id); // get logo mode, paint channel logo if adjusted ChannelLogoMode = showChannelLogo(channel_id); // get logo mode, paint channel logo if adjusted
bool logo_ok = ( g_settings.infobar_show_channellogo != 0 && ChannelLogoMode != 0); logo_ok = ( g_settings.infobar_show_channellogo != 0 && ChannelLogoMode != 0);
fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_settings.infobar_show_channellogo, ChannelLogoMode, logo_ok); fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_settings.infobar_show_channellogo, ChannelLogoMode, logo_ok);
int ChanNumYPos = BoxStartY + ChanHeight; int ChanNumYPos = BoxStartY + ChanHeight;
@@ -714,7 +715,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
} }
} }
if (g_settings.infobar_show_channellogo != 5) { if (g_settings.infobar_show_channellogo != 5 || !logo_ok) {
if (ChannelLogoMode != 2) { if (ChannelLogoMode != 2) {
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString( g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString(
ChanNameX + 10 + ChanNumWidth, ChanNameY + time_height, ChanNameX + 10 + ChanNumWidth, ChanNameY + time_height,