Fix Rename and Delete Worlds

This commit is contained in:
GabsPuNs
2026-04-27 01:15:05 -04:00
parent 64615f77a7
commit 3aad8decb0
10 changed files with 7 additions and 12 deletions

View File

@@ -2580,19 +2580,16 @@ int UIScene_LoadCreateJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam
// check the name is valid
if (ui16Text[0] != 0)
{
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined(__PSVITA__))
// open the save and overwrite the metadata
StorageManager.RenameSaveData(pClass->m_iSaveListIndex, ui16Text, &UIScene_LoadCreateJoinMenu::RenameSaveDataReturned, pClass);
#endif
int displayIdx = pClass->m_iSaveListIndex;
auto pSaveInfo = &pClass->m_pSaveDetails->SaveInfoA[pClass->m_saveDetails[displayIdx].saveId];
StorageManager.RenameSaveData(pSaveInfo, ui16Text, &UIScene_LoadCreateJoinMenu::RenameSaveDataReturned, pClass);
}
else
{
pClass->m_bIgnoreInput = false;
pClass->updateTooltips();
}
}
else
{
pClass->m_bIgnoreInput = false;
@@ -3305,21 +3302,18 @@ int UIScene_LoadCreateJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C
auto* pClass = static_cast<UIScene_LoadCreateJoinMenu*>(pParam);
// results switched for this dialog
// Check that we have a valid save selected (can get a bad index if the save list has been refreshed)
bool validSelection= pClass->m_iDefaultButtonsC != 0 && pClass->m_iSaveListIndex >= pClass->m_iDefaultButtonsC;
if(result==C4JStorage::EMessage_ResultDecline && validSelection)
if(result==C4JStorage::EMessage_ResultDecline)
{
if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
pClass->m_bIgnoreInput=false;
else
{
int displayIdx = pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC;
int displayIdx = pClass->m_iSaveListIndex;
if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
{
auto pSaveInfo = &pClass->m_pSaveDetails->SaveInfoA[pClass->m_saveDetails[displayIdx].saveId];
StorageManager.DeleteSaveData(pSaveInfo, DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId());
StorageManager.DeleteSaveData(pSaveInfo, &UIScene_LoadCreateJoinMenu::DeleteSaveDataReturned, (LPVOID)pClass->GetCallbackUniqueId());
}
pClass->m_controlSavesTimer.setVisible( true );