diff options
| author |  Yuri Kunde Schlesner | 2016-12-23 12:42:40 -0800 |
|---|---|---|
| committer |  GitHub | 2016-12-23 12:42:40 -0800 |
| commit | 56e4066f4f51fe944dcbb2f6cbff2cbe823915ed (patch) | |
| tree | 1eb162e17f3c0126a849ef101cfb2d45594390b9 /src/common | |
| parent | Merge pull request #2364 from mailwl/nwm-services (diff) | |
| parent | file_util: fix missing sysdata path (diff) | |
| download | yuzu-56e4066f4f51fe944dcbb2f6cbff2cbe823915ed.tar.gz yuzu-56e4066f4f51fe944dcbb2f6cbff2cbe823915ed.tar.xz yuzu-56e4066f4f51fe944dcbb2f6cbff2cbe823915ed.zip | |
Merge pull request #2370 from wwylele/where-is-my-shared-font
file_util: fix missing sysdata path
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/file_util.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 5ab938a24..1a1f5d9b5 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp | |||
| @@ -697,9 +697,6 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string& new | |||
| 697 | 697 | ||
| 698 | paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; | 698 | paths[D_CONFIG_IDX] = paths[D_USER_IDX] + CONFIG_DIR DIR_SEP; |
| 699 | paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; | 699 | paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; |
| 700 | paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; | ||
| 701 | paths[D_NAND_IDX] = paths[D_USER_IDX] + NAND_DIR DIR_SEP; | ||
| 702 | paths[D_SYSDATA_IDX] = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP; | ||
| 703 | #else | 700 | #else |
| 704 | if (FileUtil::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) { | 701 | if (FileUtil::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) { |
| 705 | paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; | 702 | paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; |
| @@ -717,6 +714,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string& new | |||
| 717 | #endif | 714 | #endif |
| 718 | paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; | 715 | paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; |
| 719 | paths[D_NAND_IDX] = paths[D_USER_IDX] + NAND_DIR DIR_SEP; | 716 | paths[D_NAND_IDX] = paths[D_USER_IDX] + NAND_DIR DIR_SEP; |
| 717 | paths[D_SYSDATA_IDX] = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP; | ||
| 720 | } | 718 | } |
| 721 | 719 | ||
| 722 | if (!newPath.empty()) { | 720 | if (!newPath.empty()) { |