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

Qt/Input: immediately abort remapping if the controller was disconnected

Browse source 
added some fixups
This commit is contained in:
Megamouse 2018-12-22 18:23:11 +01:00
parent 6dcf66b064
commit e80f2793eb
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -400,10 +400,18 @@ void pad_settings_dialog::SwitchPadInfo(const std::string& pad_name, bool is_con
for (int i = 0; i < ui->chooseDevice->count(); i++) for (int i = 0; i < ui->chooseDevice->count(); i++)
{ {
const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>(); const pad_info info = ui->chooseDevice->itemData(i).value<pad_info>();
if (info.name == pad_name && info.is_connected != is_connected) if (info.name == pad_name)
{ {
ui->chooseDevice->setItemData(i, QVariant::fromValue(pad_info{ pad_name, is_connected })); if (info.is_connected != is_connected)
ui->chooseDevice->setItemText(i, is_connected ? qstr(pad_name) : (qstr(pad_name) + Disconnected_suffix)); {
ui->chooseDevice->setItemData(i, QVariant::fromValue(pad_info{ pad_name, is_connected }));
ui->chooseDevice->setItemText(i, is_connected ? qstr(pad_name) : (qstr(pad_name) + Disconnected_suffix));
}
if (!is_connected && m_timer.isActive() && ui->chooseDevice->currentIndex() == i)
{
ReactivateButtons();
}
break; break;
} }
} }
@ -831,7 +839,7 @@ void pad_settings_dialog::ChangeInputType()
for (int i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI for (int i = 1; i <= m_handler->max_devices(); i++) // Controllers 1-n in GUI
{ {
const QString device_name = name_string + QString::number(i); const QString device_name = name_string + QString::number(i);
ui->chooseDevice->addItem(device_name, QVariant::fromValue(pad_info{ sstr(device_name), false })); ui->chooseDevice->addItem(device_name, QVariant::fromValue(pad_info{ sstr(device_name), true }));
} }
force_enable = true; force_enable = true;
break; break;