diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 76c419a999..2ddf2d4baf 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -954,9 +954,9 @@ int PSPSaveDialog::Update(int animSpeed) break; case SCE_UTILITY_SAVEDATA_TYPE_READDATA: case SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE: - if(param.secureShouldSkip(param.GetPspParam(),param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE)) + if(param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave, param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE)) param.GetPspParam()->common.result = 0; - else if (param.Load(param.GetPspParam(), GetSelectedSaveDirName(), currentSelectedSave, param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE)) + else if (param.secureCanSkip(param.GetPspParam(),param.GetPspParam()->mode == SCE_UTILITY_SAVEDATA_TYPE_READDATASECURE)) param.GetPspParam()->common.result = 0; else param.GetPspParam()->common.result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA; // not sure if correct code diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 951c4c7418..2e8b9b7a5c 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -1542,7 +1542,7 @@ bool SavedataParam::IsInSaveDataList(std::string saveName, int count) { return false; } -bool SavedataParam::secureShouldSkip(SceUtilitySavedataParam* param, bool secureMode) { +bool SavedataParam::secureCanSkip(SceUtilitySavedataParam* param, bool secureMode) { if(!secureMode) // Only check in secure mode. return false; std::string dirPath = savePath + GetGameName(param) + GetSaveName(param); @@ -1557,7 +1557,7 @@ bool SavedataParam::secureShouldSkip(SceUtilitySavedataParam* param, bool secure // Get secure file names from PARAM.SFO. secureFileNames = getSecureFileNames(dirPath); // Secure file name should be saved in PARAM.SFO - // Cannot find name in PARAM.SFO, skip. + // Cannot find name in PARAM.SFO, could skip. if(secureFileNames.find(secureFileName) == secureFileNames.end()) return true; diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index 27bf2da74e..5798a8fd7f 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -305,7 +305,7 @@ public: bool GetSize(SceUtilitySavedataParam* param); bool IsSaveEncrypted(SceUtilitySavedataParam* param, const std::string &saveDirName); bool IsInSaveDataList(std::string saveName, int count); - bool secureShouldSkip(SceUtilitySavedataParam* param, bool secureMode); + bool secureCanSkip(SceUtilitySavedataParam* param, bool secureMode); std::string GetGameName(SceUtilitySavedataParam* param); std::string GetSaveName(SceUtilitySavedataParam* param);