piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Use distinct values for profile key

Browse Source 
Because the last commit made us use separate folders for GCPad and
GCKey profiles, we should also use separate game INI keys for them.
Otherwise setting e.g. PadProfile1 in a game INI will make both GCPad
and GCKey try to load it, typically with one of them succeeding and the
other one showing a panic alert due to the profile not existing in its
folder.

Better do this breaking change for GCKeys in the same PR as the other
breaking change rather than later.
This commit is contained in:
JosJuice
2024-02-04 17:36:15 +01:00
parent 6cf55ab1ee
commit 1315b54ffa
8 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/InputCommon/InputConfig.h
View File

@ -24,15 +24,8 @@ class EmulatedController;
class InputConfig
{
public:
enum class InputClass
{
GC,
Wii,
GBA,
};
InputConfig(const std::string& ini_name, const std::string& gui_name,
const std::string& profile_directory_name, InputClass input_class);
const std::string& profile_directory_name, const std::string& profile_key);
~InputConfig();
@ -51,7 +44,7 @@ public:
bool IsControllerControlledByGamepadDevice(int index) const;
std::string GetGUIName() const { return m_gui_name; }
std::string GetProfileKey() const;
std::string GetProfileKey() const { return m_profile_key; }
std::string GetProfileDirectoryName() const { return m_profile_directory_name; }
std::string GetUserProfileDirectoryPath() const;
std::string GetSysProfileDirectoryPath() const;
@ -69,6 +62,6 @@ private:
const std::string m_ini_name;
const std::string m_gui_name;
const std::string m_profile_directory_name;
const InputClass m_input_class;
const std::string m_profile_key;
InputCommon::DynamicInputTextureManager m_dynamic_input_tex_config_manager;
};