diff options
| author | louis <louis.braun@gmx.de> | 2012-12-07 14:44:55 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2012-12-07 14:44:55 +0100 |
| commit | a8a2bd61fd2931b79c0f39812ef30a0cc7292d82 (patch) | |
| tree | 30d0fc1e8ef1facc51b4ed951fed5a5484864132 /menuitem.c | |
| parent | d58b48418a7ce80d2186c720f20a06d46a78a2ec (diff) | |
| download | skin-nopacity-a8a2bd61fd2931b79c0f39812ef30a0cc7292d82.tar.gz skin-nopacity-a8a2bd61fd2931b79c0f39812ef30a0cc7292d82.tar.bz2 | |
Fixed some crashes
Diffstat (limited to 'menuitem.c')
| -rw-r--r-- | menuitem.c | 45 |
1 files changed, 30 insertions, 15 deletions
@@ -221,30 +221,42 @@ void cNopacityScheduleMenuItem::Render() { if (selectable) { //Build Date & Time & Status - if (config.epgSearchConf->epgSearchConfig[mode][eEPGtime_d] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGtime_d] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGtime_d] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGtime_d]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGtime_w] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGtime_w] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGtime_w] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGtime_w]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGdate] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGdate] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGdate] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGdate]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGdatesh] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGdatesh] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGdatesh] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGdatesh]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGtime] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGtime] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGtime] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGtime]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGtimespan] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGtimespan] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGtimespan] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGtimespan]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGstatus] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGstatus] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGstatus] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGstatus]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGt_status] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGt_status] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGt_status] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGt_status]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGv_status] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGv_status] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGv_status] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGv_status]] << " "; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGr_status] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGr_status] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGr_status] < MAXITEMTABS)) sstrDateTime << *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGr_status]] << " "; //Build title and subtitle - if (config.epgSearchConf->epgSearchConfig[mode][eEPGtitle] > -1) { + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGtitle] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGtitle] < MAXITEMTABS)) { strTitle = *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGtitle]]; - if (config.epgSearchConf->epgSearchConfig[mode][eEPGsubtitle] > -1) { + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGsubtitle] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGsubtitle] < MAXITEMTABS)) { strSubtitle = *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGsubtitle]]; } else { size_t delimiter = strTitle.find("~"); @@ -271,14 +283,17 @@ void cNopacityScheduleMenuItem::Render() { strSubtitle = sstrSubtitle.str(); } //Build Channel Name - if (config.epgSearchConf->epgSearchConfig[mode][eEPGchlng] > -1) + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGchlng] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGchlng] < MAXITEMTABS)) strChannelName = *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGchlng]]; - else if (config.epgSearchConf->epgSearchConfig[mode][eEPGchsh] > -1) + else if ((config.epgSearchConf->epgSearchConfig[mode][eEPGchsh] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGchsh] < MAXITEMTABS)) strChannelName = *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGchsh]]; else strChannelName = ""; //Build Progressbar - if (config.epgSearchConf->epgSearchConfig[mode][eEPGprogrT2S] > -1) { + if ((config.epgSearchConf->epgSearchConfig[mode][eEPGprogrT2S] > -1) + &&(config.epgSearchConf->epgSearchConfig[mode][eEPGprogrT2S] < MAXITEMTABS)) { strProgressbar = *itemTabs[config.epgSearchConf->epgSearchConfig[mode][eEPGprogrT2S]]; hasProgressBar = true; } |