* Placed initialization of cache behind initialization of language.

This commit is contained in:
overjoy.psm 2012-01-29 23:55:49 +00:00
parent a8e1913895
commit 016f965af0
2 changed files with 7 additions and 8 deletions

View File

@ -51,9 +51,9 @@ void CachedList<T>::Load(string path, string containing) /* Load All
fclose(file);
remove(path.c_str());
m_loaded = true;
m_update = false;
m_lastLanguage = m_curLanguage;
m_loaded = true;
m_update = false;
if(!music && pathlist.size() > 0)
{
@ -62,11 +62,10 @@ void CachedList<T>::Load(string path, string containing) /* Load All
}
}
else
{
CCache<T>(*this, m_database, LOAD);
m_lastLanguage = m_curLanguage;
m_update = false;
m_loaded = true;
m_loaded = true;
}
}
template<>

View File

@ -264,8 +264,6 @@ void CMenu::init(void)
makedir((char *)m_wipDir.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
m_cat.load(sfmt("%s/" CAT_FILENAME, m_settingsDir.c_str()).c_str());
string themeName = m_cfg.getString("GENERAL", "theme", "DEFAULT");
@ -313,6 +311,8 @@ void CMenu::init(void)
m_curLanguage = CMenu::_translations[0];
m_loc.load(sfmt("%s/%s.ini", m_languagesDir.c_str(), m_curLanguage.c_str()).c_str());
}
m_gameList.Init(m_listCacheDir, m_settingsDir, m_loc.getString(m_curLanguage, "gametdb_code", "EN"));
m_aa = 3;