gui/infoviewer.cpp: fix tuner icon display

This commit is contained in:
[CST] Focus
2013-03-26 19:54:29 +04:00
parent fc0571490e
commit d60f6691d6
2 changed files with 6 additions and 7 deletions

View File

@@ -1221,8 +1221,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
infoViewerBB->showIcon_SubT(); infoViewerBB->showIcon_SubT();
//infoViewerBB->showIcon_CA_Status(0); //infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->showIcon_Resolution(); infoViewerBB->showIcon_Resolution();
if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE) infoViewerBB->showIcon_Tuner();
infoViewerBB->showIcon_Tuner();
} }
} }
return messages_return::handled; return messages_return::handled;

View File

@@ -195,11 +195,8 @@ void CInfoViewerBB::getBBIconInfo()
iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h);
break; break;
case CInfoViewerBB::ICON_TUNER: case CInfoViewerBB::ICON_TUNER:
if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE) { if (g_settings.infobar_show_tuner == 1)
if (g_settings.infobar_show_tuner == 1) { iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
}
}
break; break;
default: default:
break; break;
@@ -599,6 +596,9 @@ void CInfoViewerBB::showOne_CAIcon()
void CInfoViewerBB::showIcon_Tuner() void CInfoViewerBB::showIcon_Tuner()
{ {
if(CFEManager::getInstance()->getFrontendCount() <= 1)
return;
std::string icon_name; std::string icon_name;
switch (CFEManager::getInstance()->getLiveFE()->getNumber()) { switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {
case 1: case 1: