diff --git a/out/boot.dol b/out/boot.dol index ea59a141..e8ae40c2 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index 17366bd4..7f45da24 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -2442,13 +2442,18 @@ bool CMenu::_loadPluginList() { Config scummvm; vector 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 scummvmList = m_plugin.ParseScummvmINI(scummvm, DeviceName[currentPartition], Magic); for(vector::iterator tmp_itr = scummvmList.begin(); tmp_itr != scummvmList.end(); tmp_itr++) m_gameList.push_back(*tmp_itr); scummvmList.clear(); vector().swap(scummvmList); + scummvm.unload(); } } m_cfg.remove(PLUGIN_DOMAIN, "update_cache");