diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 5561b0e187..0f6b7adfb6 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -11,7 +11,6 @@ #define ROOT_DIR "." // The normal user directory -#ifndef STEAM #ifdef _WIN32 #define NORMAL_USER_DIR "Dolphin Emulator" #elif defined(__APPLE__) @@ -21,15 +20,6 @@ #else #define NORMAL_USER_DIR "dolphin-emu" #endif -#else // ifndef STEAM -#ifdef _WIN32 -#define NORMAL_USER_DIR "Dolphin Emulator (Steam)" -#elif defined(__APPLE__) -#define NORMAL_USER_DIR "Library/Application Support/Dolphin (Steam)" -#else -#define NORMAL_USER_DIR "dolphin-emu-steam" -#endif -#endif // The portable user directory #ifdef _WIN32 diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 4575498fb5..414581f305 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -308,21 +308,12 @@ void SetUserDirectory(std::string custom_path) // -> Use AppData\Roaming\Dolphin Emulator as the User directory path // 6. Default // -> Use GetExeDirectory()\User - // - // On Steam builds, we take a simplified approach: - // 1. GetExeDirectory()\portable.txt exists - // -> Use GetExeDirectory()\User - // 2. AppData\Roaming exists - // -> Use AppData\Roaming\Dolphin Emulator (Steam) as the User directory path - // 3. Default - // -> Use GetExeDirectory()\User // Get AppData path in case we need it. wil::unique_cotaskmem_string appdata; bool appdata_found = SUCCEEDED( SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_DEFAULT, nullptr, appdata.put())); -#ifndef STEAM // Check our registry keys wil::unique_hkey hkey; DWORD local = 0; @@ -389,21 +380,6 @@ void SetUserDirectory(std::string custom_path) { user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP; } -#else // ifndef STEAM - if (File::Exists(File::GetExeDirectory() + DIR_SEP "portable.txt")) // Case 1 - { - user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP; - } - else if (appdata_found) // Case 2 - { - user_path = TStrToUTF8(appdata.get()) + DIR_SEP NORMAL_USER_DIR DIR_SEP; - } - else // Case 3 - { - user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP; - } -#endif - #else if (File::IsDirectory(ROOT_DIR DIR_SEP EMBEDDED_USER_DIR)) {