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

gui/infoviewer.cpp: add safe check

Browse Source
This commit is contained in:
[CST] Focus
2012-03-16 14:20:26 +04:00
parent 5cc7321132
commit 02099ffd9a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/infoviewer.cpp
View File

@@ -661,8 +661,10 @@ void CInfoViewer::check_channellogo_ca_SettingsChange()
void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos) void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos)
{ {
showTitle(channel->number, channel->getName(), channel->getSatellitePosition(), if(channel) {
channel->getChannelID(), calledFromNumZap, epgpos); showTitle(channel->number, channel->getName(), channel->getSatellitePosition(),
channel->getChannelID(), calledFromNumZap, epgpos);
}
} }
void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos) void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos)
@@ -748,7 +750,6 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con
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;
//if (g_settings.infobar_sat_display && satellitePosition >= 0 && !satellitePositions.empty()) {
if (g_settings.infobar_sat_display) { if (g_settings.infobar_sat_display) {
std::string name = CServiceManager::getInstance()->GetSatelliteName(satellitePosition); std::string name = CServiceManager::getInstance()->GetSatelliteName(satellitePosition);
int satNameWidth = g_SignalFont->getRenderWidth (name); int satNameWidth = g_SignalFont->getRenderWidth (name);