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

fix conflict

Browse Source
This commit is contained in:
[CST] Focus
2012-06-18 14:56:17 +04:00
parent 02f66f3234 41f365f308
commit 5dd54caf54
32 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/channellist.cpp
View File

@@ -678,7 +678,7 @@ int CChannelList::show()
actzap = updateSelection(new_selected);
}
else if (msg == (neutrino_msg_t)g_settings.key_bouquet_up) {
if (bouquetList->Bouquets.size() > 0) {
if (!bouquetList->Bouquets.empty()) {
bool found = true;
uint32_t nNext = (bouquetList->getActiveBouquetNumber()+1) % bouquetList->Bouquets.size();
if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
@@ -700,7 +700,7 @@ int CChannelList::show()
}
}
else if (msg == (neutrino_msg_t)g_settings.key_bouquet_down) {
if (bouquetList->Bouquets.size() > 0) {
if (!bouquetList->Bouquets.empty()) {
bool found = true;
int nNext = (bouquetList->getActiveBouquetNumber()+bouquetList->Bouquets.size()-1) % bouquetList->Bouquets.size();
if(bouquetList->Bouquets[nNext]->channelList->getSize() <= 0) {
@@ -1421,7 +1421,7 @@ void CChannelList::virtual_zap_mode(bool up)
void CChannelList::quickZap(int key, bool /* cycle */)
{
if(chanlist.size() == 0)
if(chanlist.empty())
return;
unsigned int sl = selected;