pull in project-slippi/Ishiiruka@fae0366

r2dliu · May 30, 2022 · a513283 · a513283
1 parent cf04e7d
commit a513283
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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] =