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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 13:19:03 +01:00
parent 2f63d963eb 695c7d3df9
commit c80102a917
132 changed files with 4170 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/system/flashtool.cpp
View File

@@ -467,10 +467,14 @@ void CFlashTool::reboot()
}
//-----------------------------------------------------------------------------------------------------------------
CFlashVersionInfo::CFlashVersionInfo(const std::string & versionString)
CFlashVersionInfo::CFlashVersionInfo(const std::string & _versionString)
{
//SBBBYYYYMMTTHHMM -- formatsting
std::string versionString = _versionString;
/* just to make sure the string is long enough for the following code
* trailing chars don't matter -- will just be ignored */
if (versionString.size() < 16)
versionString.append(16, '0');
// recover type
snapshot = versionString[0];
@@ -543,6 +547,8 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
const char *CFlashVersionInfo::getType(void) const
{
// TODO: localize it
switch (snapshot)
{
case '0':
@@ -557,6 +563,8 @@ const char *CFlashVersionInfo::getType(void) const
return "Settings";
case 'A':
return "Addon";
case 'U':
return "Update";
case 'T':
return "Text";
default: