- update: fix display of installed version; ...

curiously it was only broken on ARM_HARDWARE

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-11 11:02:11 +01:00
committed by Thilo Graf
parent 953793f763
commit dbf3cb8992

View File

@@ -202,10 +202,12 @@ bool CFlashUpdate::selectHttpImage(void)
int curVer, newVer, newfound = 0; int curVer, newVer, newfound = 0;
CConfigFile _configfile('\t'); CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; std::string versionString = "????????????????";
if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
versionString = _configfile.getString("version", "????????????????");
CFlashVersionInfo curInfo(versionString); CFlashVersionInfo curInfo(versionString.c_str());
printf("current flash-version: %s (%d) date %s (%ld)\n", versionString, curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime()); printf("current flash-version: %s (%d) date %s (%ld)\n", versionString.c_str(), curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime());
curVer = curInfo.getVersion(); curVer = curInfo.getVersion();
httpTool.setStatusViewer(this); httpTool.setStatusViewer(this);