mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-11 15:41:00 +02:00
fix initial load config
Origin commit data
------------------
Commit: 3c7fc63486
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-04 (Thu, 04 Feb 2021)
Origin message was:
------------------
- fix initial load config
This commit is contained in:
@@ -1191,10 +1191,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(configfile.getUnknownKeyQueryedFlag() && (erg==0)) {
|
|
||||||
erg = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef BOXMODEL_CST_HD2
|
#ifdef BOXMODEL_CST_HD2
|
||||||
g_settings.brightness = configfile.getInt32("brightness", 0);
|
g_settings.brightness = configfile.getInt32("brightness", 0);
|
||||||
g_settings.contrast = configfile.getInt32("contrast", 0);
|
g_settings.contrast = configfile.getInt32("contrast", 0);
|
||||||
@@ -1222,11 +1218,18 @@ int CNeutrinoApp::loadSetup(const char * fname)
|
|||||||
|
|
||||||
g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");
|
g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");
|
||||||
|
|
||||||
if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO)
|
if (!erg)
|
||||||
upgradeSetup(fname);
|
{
|
||||||
|
if (g_settings.version_pseudo < NEUTRINO_VERSION_PSEUDO)
|
||||||
|
upgradeSetup(fname);
|
||||||
|
|
||||||
if(erg)
|
if (configfile.getUnknownKeyQueryedFlag())
|
||||||
|
erg = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (erg)
|
||||||
configfile.setModifiedFlag(true);
|
configfile.setModifiedFlag(true);
|
||||||
|
|
||||||
return erg;
|
return erg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user