From 035a3f8b4e174b8b5f6218aaf9a05076a59aadb8 Mon Sep 17 00:00:00 2001
From: Tyler Wilding <xtvaser@gmail.com>
Date: Sat, 20 Apr 2024 23:36:41 -0400
Subject: [PATCH] game: ensure overridden dir still ends with `OpenGOAL`

---
 common/util/FileUtil.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/util/FileUtil.cpp b/common/util/FileUtil.cpp
index 77a8a09f86..f187f23c0c 100644
--- a/common/util/FileUtil.cpp
+++ b/common/util/FileUtil.cpp
@@ -90,7 +90,7 @@ fs::path get_user_settings_dir(GameVersion game_version) {
   auto game_version_name = game_version_names[game_version];
   auto config_dir = get_user_config_dir();
   if (!g_file_path_info.user_config_dir_override.empty()) {
-    config_dir = g_file_path_info.user_config_dir_override;
+    config_dir = g_file_path_info.user_config_dir_override / "OpenGOAL";
   }
   return config_dir / game_version_name / "settings";
 }
@@ -100,7 +100,7 @@ fs::path get_user_memcard_dir(GameVersion game_version) {
   auto config_dir = get_user_config_dir();
   if (!g_file_path_info.user_config_dir_override.empty() &&
       g_file_path_info.use_overridden_config_dir_for_saves) {
-    config_dir = g_file_path_info.user_config_dir_override;
+    config_dir = g_file_path_info.user_config_dir_override / "OpenGOAL";
   }
   return config_dir / game_version_name / "saves";
 }
@@ -109,7 +109,7 @@ fs::path get_user_screenshots_dir(GameVersion game_version) {
   auto game_version_name = game_version_names[game_version];
   auto config_dir = get_user_config_dir();
   if (!g_file_path_info.user_config_dir_override.empty()) {
-    config_dir = g_file_path_info.user_config_dir_override;
+    config_dir = g_file_path_info.user_config_dir_override / "OpenGOAL";
   }
   return config_dir / game_version_name / "screenshots";
 }
@@ -118,7 +118,7 @@ fs::path get_user_misc_dir(GameVersion game_version) {
   auto game_version_name = game_version_names[game_version];
   auto config_dir = get_user_config_dir();
   if (!g_file_path_info.user_config_dir_override.empty()) {
-    config_dir = g_file_path_info.user_config_dir_override;
+    config_dir = g_file_path_info.user_config_dir_override / "OpenGOAL";
   }
   return config_dir / game_version_name / "misc";
 }
@@ -127,7 +127,7 @@ fs::path get_user_features_dir(GameVersion game_version) {
   auto game_version_name = game_version_names[game_version];
   auto config_dir = get_user_config_dir();
   if (!g_file_path_info.user_config_dir_override.empty()) {
-    config_dir = g_file_path_info.user_config_dir_override;
+    config_dir = g_file_path_info.user_config_dir_override / "OpenGOAL";
   }
   auto path = config_dir / game_version_name / "features";
   file_util::create_dir_if_needed(path);