From 845a25e89769847709731cfac5fa58fff7bf37f8 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 15 Oct 2013 02:41:10 -0400 Subject: [PATCH] Whoops. Forgot to push this. --- Core/System.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Core/System.cpp b/Core/System.cpp index 5dbda2113a..0588e50728 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -381,12 +381,12 @@ std::string GetSysDirectory(PSPDirectories directoryType) { } } +#ifdef _WIN32 // Run this at startup time. Please use GetSysDirectory if you need to query where folders are. void InitSysDirectories() { - if (!g_Config.memCardDirectory.empty() && !g_Config.flash0Directory.empty()) return; -#ifdef _WIN32 + const std::string path = ConvertWStringToUTF8(File::GetExeDirectory()); // Mount a filesystem @@ -449,9 +449,5 @@ void InitSysDirectories() { if (g_Config.currentDirectory.empty()) { g_Config.currentDirectory = GetSysDirectory(DIRECTORY_GAME); } -#else - // TODO: Perhaps move your platforms' directory stuff out of NativeInit and into here. - memstickpath = g_Config.memCardDirectory; - flash0path = g_Config.flash0Directory; -#endif } +#endif