From e26a06ed8fb1a2cb68e0a178bb5bd9458b9afd11 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 14 Dec 2015 19:01:07 +0100 Subject: [PATCH] infoviewer_bb: fix text for green button in movieplayer mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a50bd5bb97fb250fc04f22482bc258b44dad3c5b Author: vanhofen Date: 2015-12-14 (Mon, 14 Dec 2015) Origin message was: ------------------ - infoviewer_bb: fix text for green button in movieplayer mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 83f8988b2..6acc46d08 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -237,19 +237,18 @@ void CInfoViewerBB::getBBButtonInfo() case CInfoViewerBB::BUTTON_GREEN: icon = NEUTRINO_ICON_BUTTON_GREEN; frameBuffer->getIconSize(icon.c_str(), &w, &h); - text = CUserMenu::getUserMenuButtonName(1, active); - mode = CNeutrinoApp::getInstance()->getMode(); - if (!text.empty() && mode < NeutrinoMessages::mode_audio) - break; mode = CNeutrinoApp::getInstance()->getMode(); if (mode == NeutrinoMessages::mode_ts) { text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active); - if (!text.empty()) + if (text != g_Locale->getText(LOCALE_MPKEY_AUDIO)) break; } + text = CUserMenu::getUserMenuButtonName(1, active); + if (!text.empty() && (mode == NeutrinoMessages::mode_tv || mode == NeutrinoMessages::mode_radio)) + break; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title; - if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD)) - text = ""; + if (text != g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD)) + break; if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) { text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName(); } else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {