From a5132839506eb7b858200c703df8a92c84d4f968 Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Mon, 30 May 2022 14:03:48 -0700 Subject: [PATCH] pull in https://github.com/project-slippi/Ishiiruka/commit/fae036635f11c4835f5f9f9c42ce122bc935feb9 --- Source/Core/Common/CommonPaths.h | 3 +++ Source/Core/Common/FileUtil.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 5cf8835454..21d857d0dc 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -134,3 +134,6 @@ // Subdirs in Sys #define GC_SYS_DIR "GC" #define WII_SYS_DIR "Wii" + +// Slippi +#define USER_JSON "user.json" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 3014e387cf..670440bd99 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -930,7 +930,7 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP; s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD; - s_user_paths[F_USERJSON_IDX] = s_user_paths[D_USER_IDX] + "user.json"; + s_user_paths[F_USERJSON_IDX] = s_user_paths[D_SLIPPI_IDX] + USER_JSON; s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP; s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =