From 5080e9660aa1a0a6a3ffacaf3852d3901be5cf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 18 Feb 2025 11:03:29 -0600 Subject: [PATCH] Remove an outdated hidden setting (bSavedataUpgrade) --- Core/Config.cpp | 1 - Core/Config.h | 1 - Core/Dialog/SavedataParam.cpp | 11 +++++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 3252f261d2..64d8b28519 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -990,7 +990,6 @@ static const ConfigSetting systemParamSettings[] = { #endif ConfigSetting("WlanPowerSave", &g_Config.bWlanPowerSave, (bool) PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF, CfgFlag::PER_GAME), ConfigSetting("EncryptSave", &g_Config.bEncryptSave, true, CfgFlag::PER_GAME | CfgFlag::REPORT), - ConfigSetting("SavedataUpgradeVersion", &g_Config.bSavedataUpgrade, true, CfgFlag::DEFAULT), ConfigSetting("MemStickSize", &g_Config.iMemStickSizeGB, 16, CfgFlag::DEFAULT), }; diff --git a/Core/Config.h b/Core/Config.h index be11218f8e..01fbe5143f 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -470,7 +470,6 @@ public: int iButtonPreference; int iLockParentalLevel; bool bEncryptSave; - bool bSavedataUpgrade; // Networking bool bEnableAdhocServer; diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 2d4b77baea..6d838c5408 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -790,12 +790,11 @@ u32 SavedataParam::LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, con } else { WARN_LOG_REPORT(Log::sceUtility, "Savedata loading with detected hashmode %d instead of file's %d", decryptMode, prevCryptMode); } - if (g_Config.bSavedataUpgrade) { - decryptMode = prevCryptMode; - auto di = GetI18NCategory(I18NCat::DIALOG); - g_OSD.Show(OSDType::MESSAGE_WARNING, di->T("When you save, it will not work on outdated PSP Firmware anymore"), 6.0f); - g_OSD.Show(OSDType::MESSAGE_WARNING, di->T("Old savedata detected"), 6.0f); - } + + decryptMode = prevCryptMode; + auto di = GetI18NCategory(I18NCat::DIALOG); + g_OSD.Show(OSDType::MESSAGE_WARNING, di->T("When you save, it will not work on outdated PSP Firmware anymore"), 6.0f); + g_OSD.Show(OSDType::MESSAGE_WARNING, di->T("Old savedata detected"), 6.0f); } hasKey = decryptMode > 1; }