From 58ab2ae81fcc85d16ca97eff5036e38cde25d3ba Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Oct 2021 23:04:56 +0200 Subject: [PATCH] webchannels-setup: always allow g_settings.livestreamResolution selection Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7e6e0b7888ab3867ce06a7576ac3f2a57f15a6ea Author: vanhofen Date: 2021-10-12 (Tue, 12 Oct 2021) Origin message was: ------------------ - webchannels-setup: always allow g_settings.livestreamResolution selection ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/webchannels_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp index a5f0d0661..00ef555cd 100644 --- a/src/gui/webchannels_setup.cpp +++ b/src/gui/webchannels_setup.cpp @@ -215,10 +215,10 @@ int CWebChannelsSetup::Show() int shortcut = 1; +#if 0 bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) && (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); -#if 0 bool _mode_webradio = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) && (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); @@ -233,7 +233,7 @@ int CWebChannelsSetup::Show() if (!webradio) { livestreamResolution = g_settings.livestreamResolution; - oc = new CMenuOptionChooser(LOCALE_LIVESTREAM_RESOLUTION, &livestreamResolution, LIVESTREAM_RESOLUTION_OPTIONS, LIVESTREAM_RESOLUTION_OPTION_COUNT, _mode_webtv, this, CRCInput::convertDigitToKey(shortcut++), "", true); + oc = new CMenuOptionChooser(LOCALE_LIVESTREAM_RESOLUTION, &livestreamResolution, LIVESTREAM_RESOLUTION_OPTIONS, LIVESTREAM_RESOLUTION_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++), "", true); // FIXME oc->setHint(NEUTRINO_ICON_HINT_DEFAULT, NONEXISTANT_LOCALE); m->addItem(oc);