From e617e5a5b45094dd06b8371b45c63a876e68cc2e Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Sun, 19 May 2024 12:55:46 -0400
Subject: [PATCH] Fix bug if 'palettes' is in exe path

---
 src/game/player_palette.c       | 26 +++++++++++++-------------
 src/game/player_palette.h       |  4 ++--
 src/pc/djui/djui_panel_player.c |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/game/player_palette.c b/src/game/player_palette.c
index e005b34a..209556aa 100644
--- a/src/game/player_palette.c
+++ b/src/game/player_palette.c
@@ -15,7 +15,7 @@ static ini_t* sPalette = NULL;
 struct PresetPalette gPresetPalettes[MAX_PRESET_PALETTES] = { 0 };
 u16 gPresetPaletteCount = 0;
 
-static bool player_palette_init(const char* palettesPath, char* palette) {
+static bool player_palette_init(const char* palettesPath, char* palette, bool appendPalettes) {
     // free old ini
     if (sPalette != NULL) {
         ini_free(sPalette);
@@ -25,10 +25,10 @@ static bool player_palette_init(const char* palettesPath, char* palette) {
     // construct path
     char path[SYS_MAX_PATH] = "";
     if (!palette || palette[0] == '\0') { palette = "Mario"; }
-    if (strstr(palettesPath, PALETTES_DIRECTORY)) {
-        snprintf(path, SYS_MAX_PATH, "%s/%s.ini", palettesPath, palette);
-    } else {
+    if (appendPalettes) {
         snprintf(path, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, palette);
+    } else {
+        snprintf(path, SYS_MAX_PATH, "%s/%s.ini", palettesPath, palette);
     }
 
     // load
@@ -54,13 +54,13 @@ static u8 read_value(const char* data) {
     return MIN(strtol(data, NULL, 0), 255);
 }
 
-void player_palettes_read(const char* palettesPath) {
+void player_palettes_read(const char* palettesPath, bool appendPalettes) {
     // construct lang path
     char lpath[SYS_MAX_PATH] = "";
-    if (strstr(palettesPath, PALETTES_DIRECTORY)) {
-        strncpy(lpath, palettesPath, SYS_MAX_PATH);
-    } else {
+    if (appendPalettes) {
         snprintf(lpath, SYS_MAX_PATH, "%s/palettes", palettesPath);
+    } else {
+        strncpy(lpath, palettesPath, SYS_MAX_PATH);
     }
 
     // open directory
@@ -84,7 +84,7 @@ void player_palettes_read(const char* palettesPath) {
         }
         if (strlen(path) == 0) { continue; }
 
-        if (!player_palette_init(palettesPath, path)) {
+        if (!player_palette_init(palettesPath, path, appendPalettes)) {
 #ifdef DEVELOPMENT
             printf("Failed to load palette '%s.ini'\n", path);
 #endif
@@ -177,13 +177,13 @@ EMBLEM_B = %d\n",
     fclose(file);
 }
 
-bool player_palette_delete(const char* palettesPath, char* name) {
+bool player_palette_delete(const char* palettesPath, char* name, bool appendPalettes) {
     // construct lang path
     char lpath[SYS_MAX_PATH] = "";
-    if (strstr(palettesPath, PALETTES_DIRECTORY)) {
-        snprintf(lpath, SYS_MAX_PATH, "%s/%s.ini", palettesPath, name);
-    } else {
+    if (appendPalettes) {
         snprintf(lpath, SYS_MAX_PATH, "%s/palettes/%s.ini", palettesPath, name);
+    } else {
+        snprintf(lpath, SYS_MAX_PATH, "%s/%s.ini", palettesPath, name);
     }
 
     if (remove(lpath) == 0) {
diff --git a/src/game/player_palette.h b/src/game/player_palette.h
index 1ff66975..396c9f1e 100644
--- a/src/game/player_palette.h
+++ b/src/game/player_palette.h
@@ -28,8 +28,8 @@ extern struct PresetPalette gPresetPalettes[MAX_PRESET_PALETTES];
 extern u16 gPresetPaletteCount;
 
 void player_palettes_reset(void);
-void player_palettes_read(const char* palettePath);
+void player_palettes_read(const char* palettePath, bool appendPalettes);
 void player_palette_export(char* name);
-bool player_palette_delete(const char* palettesPath, char* name);
+bool player_palette_delete(const char* palettesPath, char* name, bool appendPalettes);
 
 #endif
diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index 2169450a..fff96004 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -166,7 +166,7 @@ static void djui_panel_player_edit_palette_delete(UNUSED struct DjuiBase* caller
     // if (!player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer)) {
     //     player_palette_delete(sys_exe_path(), sPalettePresetNameTextBox->buffer);
     // }
-    player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer);
+    player_palette_delete(fs_get_write_path(PALETTES_DIRECTORY), sPalettePresetNameTextBox->buffer, false);
     sReloadPalettePresetSelection = true;
 }
 
@@ -404,8 +404,8 @@ void djui_panel_player_create(struct DjuiBase* caller) {
         djui_selectionbox_create(body, DLANG(PLAYER, MODEL), characterChoices, CT_MAX, &configPlayerModel, djui_panel_player_value_changed);
 
         player_palettes_reset();
-        player_palettes_read(sys_exe_path());
-        player_palettes_read(fs_get_write_path(PALETTES_DIRECTORY));
+        player_palettes_read(sys_exe_path(), true);
+        player_palettes_read(fs_get_write_path(PALETTES_DIRECTORY), false);
 
         char* palettePresets[MAX_PRESET_PALETTES + 1] = { "Custom" };
         if (gPresetPaletteCount > 0) {