From 7f962a414684a69298839d23414e76c3200b5807 Mon Sep 17 00:00:00 2001 From: OatmealDome Date: Tue, 17 Jan 2023 14:14:05 -0500 Subject: [PATCH] UICommon: Use NORMAL_USER_DIR for Windows --- Source/Core/Common/CommonPaths.h | 2 +- Source/Core/UICommon/UICommon.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 9826131241..eeef21aa85 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -11,7 +11,7 @@ #define ROOT_DIR "." #ifdef _WIN32 #define PORTABLE_USER_DIR "User" -#define NORMAL_USER_DIR "Dolphin" +#define NORMAL_USER_DIR "Dolphin Emulator" #elif defined __APPLE__ // On OS X, PORTABLE_USER_DIR exists within the .app, but *always* reference // the copy in Application Support instead! (Copied on first run) diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 98f823e546..b2dd20dc41 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -340,7 +340,7 @@ void SetUserDirectory(std::string custom_path) std::optional old_user_folder; if (documents_found) { - old_user_folder = TStrToUTF8(documents) + DIR_SEP "Dolphin Emulator" DIR_SEP; + old_user_folder = TStrToUTF8(documents) + DIR_SEP NORMAL_USER_DIR DIR_SEP; } if (local) // Case 1-2 @@ -357,7 +357,7 @@ void SetUserDirectory(std::string custom_path) } else if (appdata_found) // Case 5 { - user_path = TStrToUTF8(appdata) + DIR_SEP "Dolphin Emulator" DIR_SEP; + user_path = TStrToUTF8(appdata) + DIR_SEP NORMAL_USER_DIR DIR_SEP; // Set the UserConfigPath value in the registry for backwards compatibility with older Dolphin // builds, which will look for the default User directory in Documents. If we set this key,