From 50d969f521f0ddc198d7aaf463d0b87d297ad08f Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 12 May 2011 19:35:04 +0000 Subject: [PATCH] - addition 2 to rev.1465 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1468 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoviewer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index f384fd409..565d5b58e 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -655,10 +655,11 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con int ChanNumWidth = 0; int ChannelLogoMode = 0; + bool logo_ok = false; if (ChanNum) /* !fileplay */ { 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); 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) { g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->RenderString( ChanNameX + 10 + ChanNumWidth, ChanNameY + time_height,