mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- update: fix check for installed version; equivalent to d6bc4e2

Browse Source 
Conflicts:
	src/gui/update.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

equivalent to dbf3cb8992
This commit is contained in:
svenhoefer
2018-01-12 11:31:55 +01:00
committed by Thilo Graf
parent 25f089db7c
commit 6eebfd05d0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/update.cpp
View File

@@ -164,11 +164,13 @@ bool CFlashUpdate::checkOnlineVersion()
std::vector<CUpdateMenuTarget*> update_t_list; std::vector<CUpdateMenuTarget*> update_t_list;
CConfigFile _configfile('\t'); CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig( "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????"; std::string versionString = "????????????????";
if (_configfile.loadConfig(TARGET_PREFIX "/.version"))
versionString = _configfile.getString("version", "????????????????");
dprintf(DEBUG_NORMAL, "[update] file %s\n", g_settings.softupdate_url_file.c_str()); dprintf(DEBUG_NORMAL, "[update] file %s\n", g_settings.softupdate_url_file.c_str());
CFlashVersionInfo curInfo(versionString); CFlashVersionInfo curInfo(versionString.c_str());
curVer = curInfo.getVersion(); curVer = curInfo.getVersion();
dprintf(DEBUG_NORMAL, "[update] current flash-version: %s (%d) date %s (%ld)\n", versionString, curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime()); dprintf(DEBUG_NORMAL, "[update] current flash-version: %s (%d) date %s (%ld)\n", versionString.c_str(), curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime());
std::ifstream urlFile(g_settings.softupdate_url_file.c_str()); std::ifstream urlFile(g_settings.softupdate_url_file.c_str());
if (urlFile >> url) { if (urlFile >> url) {