Revert parts of pull request 1291

This commit is contained in:
Henrik Rydgard 2013-04-15 21:00:35 +02:00
parent 4838d7bc35
commit ce9cf6e081

View File

@ -734,10 +734,11 @@ int PSPSaveDialog::Update()
break; break;
case SCE_UTILITY_SAVEDATA_TYPE_GETSIZE: case SCE_UTILITY_SAVEDATA_TYPE_GETSIZE:
{ {
bool result = param.GetSize(param.GetPspParam());
// TODO: According to JPCSP, should test/verify this part but seems edge casey. // TODO: According to JPCSP, should test/verify this part but seems edge casey.
if (MemoryStick_State() != PSP_MEMORYSTICK_STATE_DRIVER_READY) if (MemoryStick_State() != PSP_MEMORYSTICK_STATE_DRIVER_READY)
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK; param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK;
else if (param.GetSize(param.GetPspParam())) else if (result)
param.GetPspParam()->result = 0; param.GetPspParam()->result = 0;
else else
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA; param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA;
@ -751,7 +752,7 @@ int PSPSaveDialog::Update()
param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS; param.GetPspParam()->result = SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS;
status = SCE_UTILITY_STATUS_FINISHED; status = SCE_UTILITY_STATUS_FINISHED;
break; break;
case SCE_UTILITY_SAVEDATA_TYPE_AUTODELETE: //case SCE_UTILITY_SAVEDATA_TYPE_AUTODELETE:
case SCE_UTILITY_SAVEDATA_TYPE_SINGLEDELETE: case SCE_UTILITY_SAVEDATA_TYPE_SINGLEDELETE:
if(param.Delete(param.GetPspParam(), param.GetSelectedSave())) if(param.Delete(param.GetPspParam(), param.GetSelectedSave()))
{ {