From 0b16633ee1eb4b7a4bc3aa1f0ef5f164ec5dbd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90e=C3=A4Th?= <55578911+DeaTh-G@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:17:47 +0100 Subject: [PATCH] fix options menu reset to default logic getting executed when setting is already default (#461) --- UnleashedRecomp/ui/options_menu.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/UnleashedRecomp/ui/options_menu.cpp b/UnleashedRecomp/ui/options_menu.cpp index a16252d..87134dd 100644 --- a/UnleashedRecomp/ui/options_menu.cpp +++ b/UnleashedRecomp/ui/options_menu.cpp @@ -859,16 +859,19 @@ static void DrawConfigOption(int32_t rowIndex, float yOffset, ConfigDef* conf if (g_canReset && padState.IsTapped(SWA::eKeyState_X)) { - config->MakeDefault(); + if (!config->IsDefaultValue()) + { + config->MakeDefault(); - VideoConfigValueChangedCallback(config); - XAudioConfigValueChangedCallback(config); + VideoConfigValueChangedCallback(config); + XAudioConfigValueChangedCallback(config); - if (config->Callback) - config->Callback(config); + if (config->Callback) + config->Callback(config); - if (config->ApplyCallback) - config->ApplyCallback(config); + if (config->ApplyCallback) + config->ApplyCallback(config); + } Game_PlaySound("sys_worldmap_decide"); }