1
0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 04:01:53 +02:00

Merge branch 'master' into install_locations

This commit is contained in:
Ayla 2011-04-12 13:25:00 +02:00
commit f10bb60717

View File

@ -1158,7 +1158,10 @@ void GMenu2X::options() {
if (curMenuClock!=confInt["menuClock"]) setClock(confInt["menuClock"]); if (curMenuClock!=confInt["menuClock"]) setClock(confInt["menuClock"]);
if (curGlobalVolume!=confInt["globalVolume"]) setVolume(confInt["globalVolume"]); if (curGlobalVolume!=confInt["globalVolume"]) setVolume(confInt["globalVolume"]);
if (lang == "English") lang = ""; if (lang == "English") lang = "";
if (lang != tr.lang()) tr.setLang(lang); if (lang != tr.lang()) {
tr.setLang(lang);
confStr["lang"] = lang;
}
/*if (fileExists(CARD_ROOT) && !showRootFolder) /*if (fileExists(CARD_ROOT) && !showRootFolder)
unlink(CARD_ROOT); unlink(CARD_ROOT);
else if (!fileExists(CARD_ROOT) && showRootFolder) else if (!fileExists(CARD_ROOT) && showRootFolder)