Merge remote-tracking branch 'dolphin-emu/master' into gameinis

1 files changed, 5 insertions, 1 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index f1d33c65c3..a95da19100 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -143,7 +143,11 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
 }
 
 ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
-	: ControlGroup(_name, GROUP_TYPE_STICK)
+	: AnalogStick(_name, _name, GROUP_TYPE_STICK)
+{}
+
+ControllerEmu::AnalogStick::AnalogStick(const char* const _name, const char* const _ui_name, ControlState default_radius)
+	: ControlGroup(_name, _ui_name, GROUP_TYPE_STICK)
 {
 	for (auto& named_direction : named_directions)
 		controls.emplace_back(new Input(named_direction));