From 07265b591204c31ce26fc965a4ccac6478c23461 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 16 May 2021 23:58:53 +0200 Subject: [PATCH] yweb: fix rc selection for cst Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2f15dd16325efadc3af1402fc96216bbc9d42589 Author: vanhofen Date: 2021-05-16 (Sun, 16 May 2021) Origin message was: ------------------ - yweb: fix rc selection for cst ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Settings_yWeb.yhtm | 10 ++++++++-- data/y-web/Y_Version.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm index 41baadd6e..32b0f30c8 100644 --- a/data/y-web/Y_Settings_yWeb.yhtm +++ b/data/y-web/Y_Settings_yWeb.yhtm @@ -34,8 +34,14 @@ function do_init(){ { if (fb_options[i].value == val) document.f.fb.selectedIndex = i; - if (cst && i > 2+8) - fb_options[i].disabled = true; + if (cst) + { + // rc_cst_trinity_duo is the last cst rc in selection + if (val > {=var-get:_rc_cst_trinity_duo=}) + val = {=var-get:_rc_auto=}; + if (fb_options[i].value > {=var-get:_rc_cst_trinity_duo=}) + fb_options[i].disabled = true; + } } obj_set_radio_value('screenshot_rc', "{=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false~cache=}"); val = "{=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;bouquets~cache=}"; diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index f72e30b5f..b800fd0f9 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=2.9.0.50 +version=2.9.0.51 date=16.05.2021 info=NI-Neutrino