From dacc584894b212beacede4f1f0828e01ec96e08f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 2 Jul 2021 23:37:13 +0200 Subject: [PATCH] neutrino: remove obsolete config key infobar_cn Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6ff39eb97d0162d6702b73d347716347d5f797b7 Author: vanhofen Date: 2021-07-02 (Fri, 02 Jul 2021) Origin message was: ------------------ - neutrino: remove obsolete config key infobar_cn ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 11 +++++++++-- version_pseudo.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 878399645..f31cbd659 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1243,7 +1243,7 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.infobar_casystem_frame = configfile.getInt32("infobar_casystem_frame", 0); g_settings.infobar_progressbar = configfile.getInt32("infobar_progressbar", 2); g_settings.infobar_sat_display = configfile.getBool("infobar_sat_display", true); - g_settings.infobar_show = configfile.getInt32("infobar_show", configfile.getInt32("infobar_cn", 0)); + g_settings.infobar_show = configfile.getInt32("infobar_show", 0); g_settings.infobar_show_channeldesc = configfile.getBool("infobar_show_channeldesc", false); g_settings.infobar_show_channellogo = configfile.getInt32("infobar_show_channellogo", 5); g_settings.infobar_show_dd_available = configfile.getInt32("infobar_show_dd_available", 1); @@ -1329,9 +1329,11 @@ int CNeutrinoApp::loadSetup(const char *fname) if (!erg) { - // fix wrong entry + // fix wrong entries if (g_settings.version_pseudo == "20213103000000") g_settings.version_pseudo = "20210331000000"; + else if (g_settings.version_pseudo == "20212804200000") + g_settings.version_pseudo = "20210428200000"; if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO) upgradeSetup(fname); @@ -1585,6 +1587,11 @@ void CNeutrinoApp::upgradeSetup(const char * fname) { g_settings.recording_type = CNeutrinoApp::RECORDING_FILE; } + if (g_settings.version_pseudo < "20210702230000") + { + configfile.deleteKey("infobar_cn"); + } + g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; configfile.setString("version_pseudo", g_settings.version_pseudo); diff --git a/version_pseudo.h b/version_pseudo.h index eb1bfbd84..d7f722e34 100644 --- a/version_pseudo.h +++ b/version_pseudo.h @@ -1 +1 @@ -#define NEUTRINO_VERSION_PSEUDO "20212804200000" +#define NEUTRINO_VERSION_PSEUDO "20210702230000"