Add commit for secrets file

Author: RedPanda4552

pcsx2-qt/QtHost.cpp

@@ -75,6 +75,7 @@ namespace QtHost
 	static bool ParseCommandLineOptions(const QStringList& args, std::shared_ptr<VMBootParameters>& autoboot);
 	static bool InitializeConfig();
 	static void SaveSettings();
+	static void SaveSecretsSettings();
 	static void HookSignals();
 	static void RegisterTypes();
 	static bool RunSetupWizard();
@@ -1439,6 +1440,24 @@ void QtHost::SaveSettings()
 	}
 }
 
+void QtHost::SaveSecretsSettings()
+{
+	pxAssertRel(!g_emu_thread->isOnEmuThread(), "Saving should happen on the UI thread.");
+
+	{
+		Error error;
+		auto lock = Host::GetSettingsLock();
+		if (!s_secrets_settings_interface->Save(&error))
+			Console.ErrorFmt("Failed to save settings: {}", error.GetDescription());
+	}
+
+	if (s_settings_save_timer)
+	{
+		s_settings_save_timer->deleteLater();
+		s_settings_save_timer = nullptr;
+	}
+}
+
 void Host::CommitBaseSettingChanges()
 {
 	if (!QtHost::IsOnUIThread())
@@ -1447,6 +1466,35 @@ void Host::CommitBaseSettingChanges()
 		return;
 	}
 
+	auto lock = Host::GetSettingsLock();
+	if (s_settings_save_timer)
+		return;
+
+	s_settings_save_timer = new QTimer;
+	s_settings_save_timer->connect(s_settings_save_timer, &QTimer::timeout, &QtHost::SaveSecretsSettings);
+	s_settings_save_timer->setSingleShot(true);
+	s_settings_save_timer->start(SETTINGS_SAVE_DELAY);
+
+	static bool connected = false;
+	if (!connected)
+	{
+		QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, []() {
+			delete s_settings_save_timer;
+			s_settings_save_timer = nullptr;
+		});
+
+		connected = true;
+	}
+}
+
+void Host::CommitSecretsSettingChanges()
+{
+	if (!QtHost::IsOnUIThread())
+	{
+		QtHost::RunOnUIThread(&Host::CommitSecretsSettingChanges);
+		return;
+	}
+
 	auto lock = Host::GetSettingsLock();
 	if (s_settings_save_timer)
 		return;

pcsx2/Achievements.cpp

@@ -1776,6 +1776,7 @@ void Achievements::ClientLoginWithPasswordCallback(int result, const char* error
 	Host::SetBaseStringSettingValue("Achievements", "LoginTimestamp", fmt::format("{}", std::time(nullptr)).c_str());
 	Host::Internal::GetSecretsSettingsLayer()->SetStringValue("Achievements", "Token", user->token);
 	Host::CommitBaseSettingChanges();
+	Host::CommitSecretsSettingChanges();
 
 	ShowLoginSuccess(client);
 }

pcsx2/Host.h

@@ -124,6 +124,7 @@ namespace Host
 	bool ContainsBaseSettingValue(const char* section, const char* key);
 	void RemoveBaseSettingValue(const char* section, const char* key);
 	void CommitBaseSettingChanges();
+	void CommitSecretsSettingChanges();
 
 	/// Settings access, thread-safe.
 	std::string GetStringSettingValue(const char* section, const char* key, const char* default_value = "");