diff --git a/Data/Sys/Profiles/GCPad/SDL Gamepad.ini b/Data/Sys/Profiles/GCPad/SDL Gamepad.ini new file mode 100644 index 00000000000..5afb0f6ba24 --- /dev/null +++ b/Data/Sys/Profiles/GCPad/SDL Gamepad.ini @@ -0,0 +1,26 @@ +[Profile] +Buttons/A = `Button A` +Buttons/B = `Button B` +Buttons/X = `Button X` +Buttons/Y = `Button Y` +Buttons/Z = `Shoulder R` +Buttons/Start = `Start` +Main Stick/Up = `Left Y+` +Main Stick/Down = `Left Y-` +Main Stick/Left = `Left X-` +Main Stick/Right = `Left X+` +Main Stick/Calibration = 100.00 +C-Stick/Up = `Right Y+` +C-Stick/Down = `Right Y-` +C-Stick/Left = `Right X-` +C-Stick/Right = `Right X+` +C-Stick/Calibration = 100.00 +Triggers/L = `Trigger L` +Triggers/R = `Trigger R` +Triggers/L-Analog = `Trigger L` +Triggers/R-Analog = `Trigger R` +D-Pad/Up = `Pad N` +D-Pad/Down = `Pad S` +D-Pad/Left = `Pad W` +D-Pad/Right = `Pad E` +Rumble/Motor = `Motor L` | `Motor R` diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp index 2d299981db0..ce0105b90fd 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp @@ -115,7 +115,7 @@ void EmulatedController::LoadConfig(Common::IniFile::Section* sec) const auto lock = EmulatedController::GetStateLock(); std::string defdev; - if (sec->Get("Device", &defdev, "")) + if (sec->Get("Device", &defdev, "") && !defdev.empty()) SetDefaultDevice(defdev); LoadGroupsConfig(sec, "");