mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: remove obsolete config key infobar_cn

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ff39eb97d
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2021-07-02 23:37:13 +02:00
parent f7c53f7266
commit dacc584894
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -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);