supplement to 39d52d626c, fix upnpplayer mode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dc78e9584
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-12-19 (Fri, 19 Dec 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2014-12-19 15:38:10 +01:00
parent b9977c2382
commit afafcfb70b

View File

@@ -233,13 +233,12 @@ void CInfoViewerBB::getBBButtonInfo()
frameBuffer->getIconSize(icon.c_str(), &w, &h);
text = CUserMenu::getUserMenuButtonName(1, active);
mode = CNeutrinoApp::getInstance()->getMode();
if (!text.empty() && mode != NeutrinoMessages::mode_ts)
if (!text.empty() && mode < NeutrinoMessages::mode_audio)
break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title;
if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))
text = "";
mode = CNeutrinoApp::getInstance()->getMode();
if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv) && !CMoviePlayerGui::getInstance().timeshift) {
if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) {
text = CMoviePlayerGui::getInstance().CurrentAudioName();
} else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {
int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid;