From b549a4e6e5a673249644df8c1031973d3b0b2a80 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 15 Oct 2013 02:40:08 -0400 Subject: [PATCH] Assume g_Config.memCardDirectory will have a trailing slash. Make InitSysDirectories for Win32 only. --- Core/System.cpp | 12 ++++++------ Core/System.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Core/System.cpp b/Core/System.cpp index 0293296426..5dbda2113a 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -363,17 +363,17 @@ CoreParameter &PSP_CoreParameter() { std::string GetSysDirectory(PSPDirectories directoryType) { switch (directoryType) { case DIRECTORY_CHEATS: - return g_Config.memCardDirectory + "/PSP/Cheats/"; + return g_Config.memCardDirectory + "PSP/Cheats/"; case DIRECTORY_GAME: - return g_Config.memCardDirectory + "/PSP/GAME/"; + return g_Config.memCardDirectory + "PSP/GAME/"; case DIRECTORY_SAVEDATA: - return g_Config.memCardDirectory + "/PSP/SAVEDATA/"; + return g_Config.memCardDirectory + "PSP/SAVEDATA/"; case DIRECTORY_SCREENSHOT: - return g_Config.memCardDirectory + "/PSP/SCREENSHOT/"; + return g_Config.memCardDirectory + "PSP/SCREENSHOT/"; case DIRECTORY_SYSTEM: - return g_Config.memCardDirectory + "/PSP/SYSTEM/"; + return g_Config.memCardDirectory + "PSP/SYSTEM/"; case DIRECTORY_PAUTH: - return g_Config.memCardDirectory + "/PAUTH/"; + return g_Config.memCardDirectory + "PAUTH/"; // Just return the memory stick root if we run into some sort of problem. default: ERROR_LOG(FILESYS, "Unknown directory type."); diff --git a/Core/System.h b/Core/System.h index 7bafa35a05..300c8d03c7 100644 --- a/Core/System.h +++ b/Core/System.h @@ -68,7 +68,9 @@ bool IsOnSeparateCPUThread(); bool IsAudioInitialised(); std::string GetSysDirectory(PSPDirectories directoryType); +#ifdef _WIN32 void InitSysDirectories(); +#endif // RUNNING must be at 0, NEXTFRAME must be at 1. enum CoreState