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

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

Browse Source 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-13 12:52:23 +02:00
parent 2097d7e876 1a2f2df4e8
commit b6b296939a
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/neutrino.cpp
View File

@@ -1175,6 +1175,11 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
if (g_settings.mode_icons_flag[4].empty())
g_settings.mode_icons_flag[4] = FLAGDIR "/.update";
}
if (g_settings.version_pseudo < "20170913110000")
{
//remove easymenu
configfile.deleteKey("easymenu");
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo);