From 1f2a9354580e001938cb5ba7edb5cec047baa286 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Wed, 18 Mar 2026 16:31:53 +0100
Subject: [PATCH] Qt: Do not close pad settings dialog if user said no in
 duplicate button dialog

---
 rpcs3/rpcs3qt/pad_settings_dialog.cpp | 15 ++++++++++-----
 rpcs3/rpcs3qt/pad_settings_dialog.h   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 9d9d9d31e2..d0334d3ae0 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -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()
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3qt/pad_settings_dialog.h
index 56e7cc09be..4f20d2d0db 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.h
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.h
@@ -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();