diff --git a/Source/Core/Common/Src/Paths.h b/Source/Core/Common/Src/Paths.h index 95d77263de..c74e5880ff 100644 --- a/Source/Core/Common/Src/Paths.h +++ b/Source/Core/Common/Src/Paths.h @@ -30,6 +30,7 @@ #define STATESAVES_DIR "StateSaves" #define SCREENSHOTS_DIR "ScreenShots" #define LOGS_DIR "Logs" +#define MAIL_LOGS_DIR "Mail" // Dirs in Sys #define GC_SYS_DIR "GC" @@ -78,6 +79,7 @@ #define FULL_STATESAVES_DIR FULL_USERDATA_DIR STATESAVES_DIR #define FULL_SCREENSHOTS_DIR FULL_USERDATA_DIR SCREENSHOTS_DIR #define FULL_LOGS_DIR FULL_USERDATA_DIR LOGS_DIR +#define FULL_MAIL_LOGS_DIR FULL_LOGS_DIR MAIL_LOGS_DIR // Sys dirs #define FULL_SYSDATA_DIR ROOT_DIR DIR_SEP SYSDATA_DIR DIR_SEP diff --git a/Source/Core/Core/Src/LogManager.cpp b/Source/Core/Core/Src/LogManager.cpp index 5fd47ae3bc..d8a9e5d1cc 100644 --- a/Source/Core/Core/Src/LogManager.cpp +++ b/Source/Core/Core/Src/LogManager.cpp @@ -54,7 +54,7 @@ CDebugger_Log::CDebugger_Log(const char* _szShortName, const char* _szName, int strcpy((char*)m_szName, _szName); strcpy((char*)m_szShortName_, _szShortName); sprintf((char*)m_szShortName, "%s%i", _szShortName, a); - sprintf((char*)m_szFilename, "Logs/%s%i.txt", _szName, a); + sprintf((char*)m_szFilename, FULL_LOGS_DIR "%s%i.txt", _szName, a); unlink(m_szFilename); } @@ -296,4 +296,4 @@ bool IsLoggingActivated() #else return false; #endif -} \ No newline at end of file +} diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp index 78e53ec42d..522202109f 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp @@ -764,8 +764,8 @@ void CDebugger::Readfile(std::string FileName, bool GC) std::string sz = ""; std::ostringstream ci; ci << i; - std::string f0 = "Logs/Mail/" + FileName + "_sep" + ci.str() + "_sep" + "0_sep" + (GC ? "GC" : "Wii") + "_sep.log"; - std::string f1 = "Logs/Mail/" + FileName + "_sep" + ci.str() + "_sep" + "1_sep" + (GC ? "GC" : "Wii") + "_sep.log"; + std::string f0 = FULL_MAIL_LOGS_DIR + FileName + "_sep" + ci.str() + "_sep" + "0_sep" + (GC ? "GC" : "Wii") + "_sep.log"; + std::string f1 = FULL_MAIL_LOGS_DIR + FileName + "_sep" + ci.str() + "_sep" + "1_sep" + (GC ? "GC" : "Wii") + "_sep.log"; //wprintf("ifstream %s %s\n", f0.c_str(), f1.c_str()); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp index fc3b56f9c0..2f1d12e8e1 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp @@ -75,14 +75,13 @@ void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii) { if(gpName.length() > 0) // thios is currently off in the Release build { - if (!File::IsDirectory("Logs/Mail")) File::CreateDir("Logs/Mail"); std::ostringstream ci; std::ostringstream cType; ci << (resizeTo - 1); // write ci cType << type; // write cType - std::string FileName = "Logs/Mail/"; FileName += gpName; + std::string FileName = FULL_MAIL_LOGS_DIR + gpName; FileName += "_sep"; FileName += ci.str(); FileName += "_sep"; FileName += cType.str(); FileName += Wii ? "_sepWii_sep" : "_sepGC_sep"; FileName += ".log";