Qt: Do not close pad settings dialog if user said no in duplicate button dialog
This commit is contained in:
@@ -2205,7 +2205,7 @@ void pad_settings_dialog::ApplyCurrentPlayerConfig(int new_player_id)
|
|||||||
cfg.product_id.set(info.product_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);
|
ApplyCurrentPlayerConfig(m_last_player_id);
|
||||||
|
|
||||||
@@ -2225,7 +2225,9 @@ void pad_settings_dialog::save(bool check_duplicates)
|
|||||||
gui::ib_same_buttons, &result, this);
|
gui::ib_same_buttons, &result, this);
|
||||||
|
|
||||||
if (result == QMessageBox::No)
|
if (result == QMessageBox::No)
|
||||||
return;
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2238,13 +2240,16 @@ void pad_settings_dialog::save(bool check_duplicates)
|
|||||||
g_cfg_input_configs.save();
|
g_cfg_input_configs.save();
|
||||||
|
|
||||||
g_cfg_input.save(m_title_id, m_config_file);
|
g_cfg_input.save(m_title_id, m_config_file);
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pad_settings_dialog::SaveExit()
|
void pad_settings_dialog::SaveExit()
|
||||||
{
|
{
|
||||||
save(true);
|
if (save(true))
|
||||||
|
{
|
||||||
QDialog::accept();
|
QDialog::accept();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void pad_settings_dialog::CancelExit()
|
void pad_settings_dialog::CancelExit()
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ private:
|
|||||||
|
|
||||||
std::pair<QStringList, QString> get_config_files();
|
std::pair<QStringList, QString> get_config_files();
|
||||||
|
|
||||||
void save(bool check_duplicates);
|
bool save(bool check_duplicates);
|
||||||
void SaveExit();
|
void SaveExit();
|
||||||
void CancelExit();
|
void CancelExit();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user