diff options
| author | 2015-05-08 21:20:37 -0400 | |
|---|---|---|
| committer | 2015-05-08 21:20:37 -0400 | |
| commit | 917ac23dfcab37c65e11e3413e397863bd4bc000 (patch) | |
| tree | 956ca5d1a4aad3383c4a3bfc9103476abe3f1987 /src/core/file_sys | |
| parent | Merge pull request #728 from lioncash/vars (diff) | |
| parent | Kernel: Remove unused g_main_thread variable (diff) | |
| download | yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.gz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.xz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.zip | |
Merge pull request #731 from yuriks/app-info
Kernel: Process class and ExHeader caps parsing
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/archive_savedata.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index 12624fa31..8dff51966 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include "core/file_sys/archive_savedata.h" | 12 | #include "core/file_sys/archive_savedata.h" |
| 13 | #include "core/file_sys/disk_archive.h" | 13 | #include "core/file_sys/disk_archive.h" |
| 14 | #include "core/hle/kernel/process.h" | ||
| 14 | #include "core/hle/service/fs/archive.h" | 15 | #include "core/hle/service/fs/archive.h" |
| 15 | #include "core/settings.h" | 16 | #include "core/settings.h" |
| 16 | 17 | ||
| @@ -36,7 +37,7 @@ ArchiveFactory_SaveData::ArchiveFactory_SaveData(const std::string& sdmc_directo | |||
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const Path& path) { | 39 | ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const Path& path) { |
| 39 | std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id); | 40 | std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_current_process->program_id); |
| 40 | if (!FileUtil::Exists(concrete_mount_point)) { | 41 | if (!FileUtil::Exists(concrete_mount_point)) { |
| 41 | // When a SaveData archive is created for the first time, it is not yet formatted | 42 | // When a SaveData archive is created for the first time, it is not yet formatted |
| 42 | // and the save file/directory structure expected by the game has not yet been initialized. | 43 | // and the save file/directory structure expected by the game has not yet been initialized. |
| @@ -51,7 +52,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const P | |||
| 51 | } | 52 | } |
| 52 | 53 | ||
| 53 | ResultCode ArchiveFactory_SaveData::Format(const Path& path) { | 54 | ResultCode ArchiveFactory_SaveData::Format(const Path& path) { |
| 54 | std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id); | 55 | std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_current_process->program_id); |
| 55 | FileUtil::DeleteDirRecursively(concrete_mount_point); | 56 | FileUtil::DeleteDirRecursively(concrete_mount_point); |
| 56 | FileUtil::CreateFullPath(concrete_mount_point); | 57 | FileUtil::CreateFullPath(concrete_mount_point); |
| 57 | return RESULT_SUCCESS; | 58 | return RESULT_SUCCESS; |