From f0758fc3e234dcc1bff3e8c355019aff4ad08178 Mon Sep 17 00:00:00 2001 From: bushing Date: Mon, 8 Dec 2008 11:34:26 +0000 Subject: [PATCH] begin using GetUserDirectory() git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1448 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/FileUtil.cpp | 11 ++++++++--- .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 99888a99ab..86ae07fa51 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -293,19 +293,24 @@ bool Copy(const char *srcFilename, const char *destFilename) std::string GetUserDirectory() { -#ifdef _WIN32 char path[MAX_PATH]; +#ifdef _WIN32 if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL, 0, path))) { return std::string(path); } return std::string(""); #else - char *dir = getenv("HOME"); + char *homedir = getenv("HOME"); if (!dir) return std::string(""); - return dir; +#ifdef __APPLE__ + snprintf(path, sizeof(path), "%s/Library/Application Support/Dolphin"); +#else + snprintf(path, sizeof(path), "%s/.dolphin"); // XXX changeme as appropriate #endif +#endif + return std::string(path); } u64 GetSize(const char *filename) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index 4c184a3dbf..cf4e63e649 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -48,7 +48,7 @@ bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode) { // clear tmp folder { - std::string WiiTempFolder(FULL_WII_USER_DIR "tmp"); + std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp"); File::DeleteDirRecursively(WiiTempFolder.c_str()); File::CreateDir(WiiTempFolder.c_str()); }