* Damn merged commits

This commit is contained in:
overjoy.psm 2012-01-30 14:55:02 +00:00
parent 2505616944
commit 7b82175d66

View File

@ -264,8 +264,6 @@ void CMenu::init(void)
makedir((char *)m_wipDir.c_str()); makedir((char *)m_wipDir.c_str());
makedir((char *)m_listCacheDir.c_str()); makedir((char *)m_listCacheDir.c_str());
m_gameList.Init(m_listCacheDir, m_settingsDir, m_loc.getString(m_curLanguage, "gametdb_code", "EN"));
// INI files // INI files
m_cat.load(sfmt("%s/" CAT_FILENAME, m_settingsDir.c_str()).c_str()); m_cat.load(sfmt("%s/" CAT_FILENAME, m_settingsDir.c_str()).c_str());
string themeName = m_cfg.getString("GENERAL", "theme", "DEFAULT"); string themeName = m_cfg.getString("GENERAL", "theme", "DEFAULT");