The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-18 18:26:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure profile actually exists.

Browse Source
This commit is contained in:
Rachel Bryk 2013-01-09 20:41:14 -05:00
parent e32b1526b3
commit fad2468e30
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/InputCommon/Src/InputConfig.cpp
View File

@ -34,21 +34,31 @@ bool InputPlugin::LoadConfig(bool isGC)
bool useProfile[4] = {false, false, false, false}; bool useProfile[4] = {false, false, false, false};
std::string num[4] = {"1", "2", "3", "4"}; std::string num[4] = {"1", "2", "3", "4"};
std::string profile[4]; std::string profile[4];
std::string path;
if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000") if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000")
{ {
std::string type; std::string type;
if (isGC) if (isGC)
{
type = "GC"; type = "GC";
path = "Profiles/GCPad/";
}
else else
{
type = "Wii"; type = "Wii";
path = "Profiles/Wiimote/";
}
game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if (game_ini.Exists("Core", (type + "Profile" + num[i]).c_str())) if (game_ini.Exists("Core", (type + "Profile" + num[i]).c_str()))
{ {
useProfile[i] = true;
game_ini.Get("Core", (type + "Profile" + num[i]).c_str(), &profile[i]); game_ini.Get("Core", (type + "Profile" + num[i]).c_str(), &profile[i]);
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
useProfile[i] = true;
else
PanicAlertT("Selected controller profile does not exist");
} }
} }
} }
@ -64,11 +74,6 @@ bool InputPlugin::LoadConfig(bool isGC)
if (useProfile[n]) if (useProfile[n])
{ {
IniFile profile_ini; IniFile profile_ini;
std::string path;
if (isGC)
path = "Profiles/GCPad/";
else
path = "Profiles/Wiimote/";
profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
(*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); (*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
} }