From afafcfb70b0b402be9c9b211b7d1083fdb17fed7 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 19 Dec 2014 15:38:10 +0100 Subject: [PATCH] supplement to 39d52d626c57890914bf6625ecef288fd77fbba5, fix upnpplayer mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1dc78e95842ee036f335c2a0decab850c13214ee Author: Jacek Jendrzej Date: 2014-12-19 (Fri, 19 Dec 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 0694604c9..3d0c26bc2 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -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;