mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/nhttpd/web/Makefile.am
	src/nhttpd/web/Y_Blocks.txt
	src/nhttpd/web/Y_Menue.yhtm
	src/nhttpd/web/Y_Settings_yWeb.yhtm


Origin commit data
------------------
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
This commit is contained in:
vanhofen
2016-10-01 11:54:51 +02:00
parent ad7836f819 65c4cfec97
commit b76e14080e
48 changed files with 572 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/update.cpp
View File

@@ -161,7 +161,7 @@ bool CFlashUpdate::checkOnlineVersion()
std::vector<CUpdateMenuTarget*> update_t_list;
CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig("/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
#ifdef DEBUG
printf("[update] file %s\n", g_settings.softupdate_url_file.c_str());
#endif
@@ -218,7 +218,7 @@ bool CFlashUpdate::selectHttpImage(void)
int curVer, newVer, newfound = 0;
CConfigFile _configfile('\t');
const char * versionString = (_configfile.loadConfig("/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
const char * versionString = (_configfile.loadConfig(TARGET_PREFIX "/.version")) ? (_configfile.getString( "version", "????????????????").c_str()) : "????????????????";
CFlashVersionInfo curInfo(versionString);
printf("current flash-version: %s (%d) date %s (%ld)\n", versionString, curInfo.getVersion(), curInfo.getDate(), curInfo.getDateTime());