diff --git a/src/core/libraries/save_data/savedata.cpp b/src/core/libraries/save_data/savedata.cpp index 52349b355..10a89f669 100644 --- a/src/core/libraries/save_data/savedata.cpp +++ b/src/core/libraries/save_data/savedata.cpp @@ -730,12 +730,13 @@ int PS4_SYSV_ABI sceSaveDataSetSaveDataMemory(const u32 userId, const void* buf, const size_t bufSize, const int64_t offset) { LOG_INFO(Lib_SaveData, "called"); const auto& mount_dir = Common::FS::GetUserPath(Common::FS::PathType::SaveDataDir) / - std::to_string(userId) / game_serial / "sdmemory/save_mem1.sav"; + std::to_string(userId) / game_serial / "sdmemory"; - Common::FS::IOFile file(mount_dir, Common::FS::FileAccessMode::Write); + Common::FS::IOFile file(mount_dir / "save_mem1.sav", Common::FS::FileAccessMode::Write); + if (!file.IsOpen()) + return -1; file.Seek(offset); file.WriteRaw(buf, bufSize); - return ORBIS_OK; } diff --git a/src/emulator.cpp b/src/emulator.cpp index cc9cbbd98..2d3460a74 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -141,8 +141,8 @@ void Emulator::Run(const std::filesystem::path& file) { if (Common::isRelease) { window_title = fmt::format("shadPS4 v{} | {}", Common::VERSION, game_title); } else { - window_title = - fmt::format("shadPS4 v{} {} | {}", Common::VERSION, Common::g_scm_desc, game_title); + window_title = fmt::format("shadPS4 v{} {} {} | {}", Common::VERSION, Common::g_scm_branch, + Common::g_scm_desc, game_title); } window = std::make_unique( Config::getScreenWidth(), Config::getScreenHeight(), controller, window_title);