archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: fix player selection checks

Browse source
This commit is contained in:
Megamouse 2021-09-15 21:03:46 +02:00
parent 6378e16fdf
commit b955469721
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -915,7 +915,7 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
{ {
if (is_reset) if (is_reset)
{ {
const auto& cfg = GetPlayerConfig(); const cfg_pad& cfg = GetPlayerConfig();
// Update device class // Update device class
ui->chooseClass->setCurrentIndex(cfg.device_class_type); ui->chooseClass->setCurrentIndex(cfg.device_class_type);
@ -1518,7 +1518,7 @@ void pad_settings_dialog::RefreshHandlers()
void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id) void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
{ {
if (!m_handler || new_player_id < 0) if (!m_handler || new_player_id < 0 || static_cast<u32>(new_player_id) >= g_cfg_input.player.size())
{ {
return; return;
} }
@ -1528,17 +1528,6 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
auto& player = g_cfg_input.player[m_last_player_id]; auto& player = g_cfg_input.player[m_last_player_id];
m_last_player_id = new_player_id; m_last_player_id = new_player_id;
// Check for invalid selection
if (!ui->chooseDevice->isEnabled() || ui->chooseDevice->currentIndex() < 0)
{
const u32 played_id = GetPlayerIndex();
g_cfg_input.player[played_id]->handler.from_default();
g_cfg_input.player[played_id]->device.from_default();
g_cfg_input.player[played_id]->config.from_default();
return;
}
// Check for duplicate button choices // Check for duplicate button choices
if (m_handler->m_type != pad_handler::null) if (m_handler->m_type != pad_handler::null)
{ {