From 6efd5b33f7dd85610356b08afb2b643e4ad77e09 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 15 Oct 2013 02:28:14 -0400 Subject: [PATCH] We don't really need DIRECTORY_FLASH0 or DIRECTORY_MEMSTICK. --- Core/System.cpp | 4 ---- Core/System.h | 2 -- UI/GameInfoCache.cpp | 2 +- Windows/WndMainWindow.cpp | 5 +---- Windows/main.cpp | 2 +- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Core/System.cpp b/Core/System.cpp index c1e9a0e11a..0293296426 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -374,10 +374,6 @@ std::string GetSysDirectory(PSPDirectories directoryType) { return g_Config.memCardDirectory + "/PSP/SYSTEM/"; case DIRECTORY_PAUTH: return g_Config.memCardDirectory + "/PAUTH/"; - case DIRECTORY_FLASH0: - return g_Config.flash0Directory; - case DIRECTORY_MEMSTICK: - return g_Config.memCardDirectory; // 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 bb16d073a8..7bafa35a05 100644 --- a/Core/System.h +++ b/Core/System.h @@ -38,8 +38,6 @@ enum GlobalUIState { // Use these in conjunction with GetSysDirectory. enum PSPDirectories { - DIRECTORY_MEMSTICK, - DIRECTORY_FLASH0, DIRECTORY_CHEATS, DIRECTORY_SCREENSHOT, DIRECTORY_SYSTEM, diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index b6292f2463..c3afe08b80 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -74,7 +74,7 @@ std::vector GameInfo::GetSaveDataDirectories() { std::string memc = GetSysDirectory(DIRECTORY_SAVEDATA); std::vector dirs; - getFilesInDir((memc).c_str(), &dirs); + getFilesInDir(memc.c_str(), &dirs); std::vector directories; for (size_t i = 0; i < dirs.size(); i++) { diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 77547986ef..93fc79bcb6 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1131,10 +1131,7 @@ namespace MainWindow break; case ID_FILE_MEMSTICK: - { - std::string memStickDir = GetSysDirectory(DIRECTORY_MEMSTICK); - ShellExecuteA(NULL, "open", memStickDir.c_str(), 0, 0, SW_SHOW); - } + ShellExecuteA(NULL, "open", g_Config.memCardDirectory.c_str(), 0, 0, SW_SHOW); break; case ID_TOGGLE_PAUSE: diff --git a/Windows/main.cpp b/Windows/main.cpp index be0cb04f16..5c1398f00f 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -218,7 +218,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin } // On Win32 it makes more sense to initialize the system directories here - // because GetSysDirectories was called much later than this.. + // because the next place it was called was in the EmuThread, and it's too late by then. InitSysDirectories(); // Load config up here, because those changes below would be overwritten