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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-13 14:09:21 +02:00
parent 4e232439c3 a7813a885d
commit a5bc9f1050
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -1087,7 +1087,11 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
configfile.deleteKey("screen_width"); configfile.deleteKey("screen_width");
configfile.deleteKey("screen_height"); configfile.deleteKey("screen_height");
} }
if (g_settings.version_pseudo < "20170913110000")
{
//remove easymenu
configfile.deleteKey("easymenu");
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO; g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo); configfile.setString("version_pseudo", g_settings.version_pseudo);
@@ -1104,11 +1108,6 @@ void CNeutrinoApp::saveSetup(const char * fname)
if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) { if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) {
dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
} }
if (g_settings.version_pseudo < "20170913110000")
{
//remove easymenu
configfile.deleteKey("easymenu");
}
//theme/color options //theme/color options
CThemes::setTheme(configfile); CThemes::setTheme(configfile);