qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-02-05 17:01:06 +02:00
Code

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Maarten ter Huurne 2011-04-13 03:14:45 +02:00
commit f9db1fbd53
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filelister.cpp
View File

@ -73,7 +73,7 @@ void FileLister::browse()
if (showDirectories || showFiles) { if (showDirectories || showFiles) {
DIR *dirp; DIR *dirp;
if ((dirp = opendir(path.c_str())) == NULL) { if ((dirp = opendir(path.c_str())) == NULL) {
ERROR("Error: opendir(%s)\n", path.c_str()); ERROR("Unable to open directory: %s\n", path.c_str());
return; return;
} }

5
src/gmenu2x.cpp
View File

@ -1122,7 +1122,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)