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

gui/channellist.cpp: remove bouquetList checks, it never should be NULL

Browse Source
This commit is contained in:
[CST] Focus
2012-04-05 20:29:07 +04:00
parent 7abc312042
commit 9bcc63ea01
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/channellist.cpp
View File

@@ -299,7 +299,7 @@ int CChannelList::doChannelMenu(void)
char cnt[5];
bool enabled = true;
if(!bouquetList || g_settings.minimode)
if(g_settings.minimode)
return 0;
if(vlist)
@@ -611,7 +611,7 @@ int CChannelList::show()
paint();
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]);
}
else if (msg == CRCInput::RC_yellow && ( bouquetList != NULL ) ) { //FIXME
else if (msg == CRCInput::RC_yellow) {
bShowBouquetList = true;
loop=false;
}
@@ -666,7 +666,7 @@ int CChannelList::show()
}
actzap = updateSelection(new_selected);
}
else if ((msg == (neutrino_msg_t)g_settings.key_bouquet_up) && (bouquetList != NULL)) {
else if (msg == (neutrino_msg_t)g_settings.key_bouquet_up) {
if (bouquetList->Bouquets.size() > 0) {
bool found = true;
uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
@@ -688,7 +688,7 @@ int CChannelList::show()
}
}
}
else if ((msg == (neutrino_msg_t)g_settings.key_bouquet_down) && (bouquetList != NULL)) {
else if (msg == (neutrino_msg_t)g_settings.key_bouquet_down) {
if (bouquetList->Bouquets.size() > 0) {
bool found = true;
int nNext = (bouquetList->getActiveBouquetNumber()+bouquetList->Bouquets.size()-1) % bouquetList->Bouquets.size();
@@ -957,7 +957,7 @@ bool CChannelList::adjustToChannelID(const t_channel_id channel_id, bool bToo)
lastChList.store (selected, channel_id, false);
if (bToo && (bouquetList != NULL)) {
if (bToo) {
int old_mode = CNeutrinoApp::getInstance()->GetChannelMode();
int new_mode = old_mode;
bool has_channel;