dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-24 19:38:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Do not close pad settings dialog if user said no in duplicate button dialog

Browse Source
This commit is contained in:
Megamouse 2026-03-18 16:31:53 +01:00
parent 0c27b63ab4
commit 1f2a935458
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -2205,7 +2205,7 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
cfg.product_id.set(info.product_id);
}
void pad_settings_dialog::save(bool check_duplicates)
bool pad_settings_dialog::save(bool check_duplicates)
{
ApplyCurrentPlayerConfig(m_last_player_id);
@ -2225,7 +2225,9 @@ void pad_settings_dialog::save(bool check_duplicates)
gui::ib_same_buttons, &result, this);
if (result == QMessageBox::No)
return;
{
return false;
}
break;
}
@ -2238,13 +2240,16 @@ void pad_settings_dialog::save(bool check_duplicates)
g_cfg_input_configs.save();
g_cfg_input.save(m_title_id, m_config_file);
return true;
}
void pad_settings_dialog::SaveExit()
{
save(true);
QDialog::accept();
if (save(true))
{
QDialog::accept();
}
}
void pad_settings_dialog::CancelExit()

2
rpcs3/rpcs3qt/pad_settings_dialog.h
View File

@ -216,7 +216,7 @@ private:
std::pair<QStringList, QString> get_config_files();
void save(bool check_duplicates);
bool save(bool check_duplicates);
void SaveExit();
void CancelExit();