Only skip when load fail.

This commit is contained in:
shenweip committed 2013-11-12 12:14:16 +08:00
1 parent c5a6e4653b
commit d3fbbebe16
3 files changed
+5 -5

No files matched your search

+2 -2
View File
@@ -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
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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);