From 427a7aa407acb853fba80ac331f28c088c50b3ee Mon Sep 17 00:00:00 2001 From: raziel1000 Date: Mon, 8 Jul 2024 22:39:40 -0600 Subject: [PATCH] small fix in sceSaveDataGetEventResult and sceAppContentTemporaryDataMount2. --- src/core/libraries/app_content/app_content.cpp | 2 ++ src/core/libraries/save_data/savedata.cpp | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/core/libraries/app_content/app_content.cpp b/src/core/libraries/app_content/app_content.cpp index aadc368f6..7e9cf7a21 100644 --- a/src/core/libraries/app_content/app_content.cpp +++ b/src/core/libraries/app_content/app_content.cpp @@ -198,6 +198,8 @@ int PS4_SYSV_ABI sceAppContentTemporaryDataMount() { int PS4_SYSV_ABI sceAppContentTemporaryDataMount2(OrbisAppContentTemporaryDataOption option, OrbisAppContentMountPoint* mountPoint) { + if (std::string_view(mountPoint->data).empty()) // causing issues with save_data. + return ORBIS_APP_CONTENT_ERROR_PARAMETER; auto* param_sfo = Common::Singleton::Instance(); std::string id(param_sfo->GetString("CONTENT_ID"), 7, 9); const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::TempDataDir) / id; diff --git a/src/core/libraries/save_data/savedata.cpp b/src/core/libraries/save_data/savedata.cpp index 3f470e67b..7d12ed812 100644 --- a/src/core/libraries/save_data/savedata.cpp +++ b/src/core/libraries/save_data/savedata.cpp @@ -248,20 +248,12 @@ int PS4_SYSV_ABI sceSaveDataGetEventInfo() { int PS4_SYSV_ABI sceSaveDataGetEventResult(const OrbisSaveDataEventParam* eventParam, OrbisSaveDataEvent* event) { - LOG_INFO(Lib_SaveData, "called sceSaveDataGetEventResult : null = {}", (eventParam == nullptr)); - if (eventParam == nullptr) - return ORBIS_SAVE_DATA_ERROR_PARAMETER; + // eventParam can be 0/null. + if (event == nullptr) + return ORBIS_SAVE_DATA_ERROR_NOT_INITIALIZED; - const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) / - std::to_string(1) / game_serial; // fix me - - Common::FS::IOFile file(mount_dir / "param.txt", Common::FS::FileAccessMode::Read); - OrbisSaveDataParam* param = new OrbisSaveDataParam{}; - file.ReadRaw(param, sizeof(OrbisSaveDataParam)); - - LOG_INFO(Lib_SaveData, "called"); + LOG_INFO(Lib_SaveData, "called: Todo."); event->userId = 1; - return ORBIS_OK; }