mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-12-25 21:22:26 +02:00
Removed a bug where the Default skin was chosen even if another (working) skin was defined on the config file.
This commit is contained in:
parent
0993a48eca
commit
00d8a04e00
@ -642,9 +642,14 @@ void GMenu2X::readConfig() {
|
||||
inf.close();
|
||||
}
|
||||
}
|
||||
if (!confStr["lang"].empty()) tr.setLang(confStr["lang"]);
|
||||
if (!confStr["wallpaper"].empty() && !fileExists(confStr["wallpaper"])) confStr["wallpaper"] = "";
|
||||
if (confStr["skin"].empty() || !fileExists("skins/"+confStr["skin"])) confStr["skin"] = "Default";
|
||||
if (!confStr["lang"].empty())
|
||||
tr.setLang(confStr["lang"]);
|
||||
|
||||
if (!confStr["wallpaper"].empty() && !fileExists(confStr["wallpaper"]))
|
||||
confStr["wallpaper"] = "";
|
||||
|
||||
if (confStr["skin"].empty() || SurfaceCollection::getSkinPath(confStr["skin"]).empty())
|
||||
confStr["skin"] = "Default";
|
||||
|
||||
evalIntConf( &confInt["outputLogs"], 0, 0,1 );
|
||||
evalIntConf( &confInt["maxClock"], 430, 30, 500 );
|
||||
@ -1314,6 +1319,8 @@ void GMenu2X::setSkin(const string &skin, bool setWallpaper) {
|
||||
skinConfStr.clear();
|
||||
skinConfInt.clear();
|
||||
|
||||
DEBUG("GMenu2X: setting new skin %s.\n", skin.c_str());
|
||||
|
||||
//clear collection and change the skin path
|
||||
sc.clear();
|
||||
sc.setSkin(skin);
|
||||
|
Loading…
Reference in New Issue
Block a user