- now scummvm ini doesn't have to be in wiiflow/plugins. it can be in wiiflow/plugins/scummvm or apps/scummvm.

This commit is contained in:
Fledge68 2019-04-08 13:13:34 -05:00
parent 27102f4f6f
commit 3d63886818
2 changed files with 6 additions and 1 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

@ -2442,13 +2442,18 @@ bool CMenu::_loadPluginList()
{ {
Config scummvm; Config scummvm;
vector<dir_discHdr> scummvmList; vector<dir_discHdr> scummvmList;
scummvm.load(fmt("%s/%s", m_pluginsDir.c_str(), "scummvm.ini")); if(!scummvm.load(fmt("%s/scummvm.ini", m_pluginsDir.c_str())))
{
if(!scummvm.load(fmt("%s/scummvm/scummvm.ini", m_pluginsDir.c_str())))
scummvm.load(fmt("%s:/apps/scummvm/scummvm.ini", DeviceName[currentPartition]));
}
//also check if in apps folder //also check if in apps folder
scummvmList = m_plugin.ParseScummvmINI(scummvm, DeviceName[currentPartition], Magic); scummvmList = m_plugin.ParseScummvmINI(scummvm, DeviceName[currentPartition], Magic);
for(vector<dir_discHdr>::iterator tmp_itr = scummvmList.begin(); tmp_itr != scummvmList.end(); tmp_itr++) for(vector<dir_discHdr>::iterator tmp_itr = scummvmList.begin(); tmp_itr != scummvmList.end(); tmp_itr++)
m_gameList.push_back(*tmp_itr); m_gameList.push_back(*tmp_itr);
scummvmList.clear(); scummvmList.clear();
vector<dir_discHdr>().swap(scummvmList); vector<dir_discHdr>().swap(scummvmList);
scummvm.unload();
} }
} }
m_cfg.remove(PLUGIN_DOMAIN, "update_cache"); m_cfg.remove(PLUGIN_DOMAIN, "update_cache");