RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

input: add missing nullptr checks for pad

Browse Source
This commit is contained in:
Megamouse 2022-01-27 21:06:37 +01:00
parent 7977fbb9c5
commit 8efc29972d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Emu/Io/PadHandler.cpp
View File

@ -431,6 +431,11 @@ void PadHandlerBase::TranslateButtonPress(const std::shared_ptr<PadDevice>& devi
bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id) bool PadHandlerBase::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id)
{ {
if (!pad)
{
return false;
}
std::shared_ptr<PadDevice> pad_device = get_device(device); std::shared_ptr<PadDevice> pad_device = get_device(device);
if (!pad_device) if (!pad_device)
{ {

2
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -750,7 +750,7 @@ std::string keyboard_pad_handler::native_scan_code_to_string(int native_scan_cod
bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id) bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device, u8 player_id)
{ {
if (device != pad::keyboard_device_name) if (!pad || device != pad::keyboard_device_name)
return false; return false;
m_pad_configs[player_id].from_string(g_cfg_input.player[player_id]->config.to_string()); m_pad_configs[player_id].from_string(g_cfg_input.player[player_id]->config.to_string());