diff --git a/es-app/src/CollectionSystemsManager.cpp b/es-app/src/CollectionSystemsManager.cpp index 51c06adca..7072ed47a 100644 --- a/es-app/src/CollectionSystemsManager.cpp +++ b/es-app/src/CollectionSystemsManager.cpp @@ -1425,7 +1425,7 @@ void CollectionSystemsManager::addEnabledCollectionsToDisplayedSystems( std::vector CollectionSystemsManager::getSystemsFromConfig() { std::vector systems; - std::vector configPaths {SystemData::getConfigPath(false)}; + std::vector configPaths {SystemData::getConfigPath()}; // Here we don't honor the tag which may be present in the custom es_systems.xml // file under ~/.emulationstation/custom_systems as we really want to include all the themes diff --git a/es-app/src/SystemData.cpp b/es-app/src/SystemData.cpp index 2d1017719..5aa65ec8e 100644 --- a/es-app/src/SystemData.cpp +++ b/es-app/src/SystemData.cpp @@ -467,7 +467,7 @@ bool SystemData::loadConfig() LOG(LogInfo) << "Only parsing the gamelist.xml files, not scanning system directories"; } - const std::vector& configPaths {getConfigPath(true)}; + const std::vector& configPaths {getConfigPath()}; const std::string& rompath {FileData::getROMDirectory()}; bool onlyProcessCustomFile {false}; @@ -897,28 +897,10 @@ void SystemData::deleteSystems() sSystemVector.clear(); } -std::vector SystemData::getConfigPath(bool legacyWarning) +std::vector SystemData::getConfigPath() { std::vector paths; - if (legacyWarning) { - const std::string& legacyConfigFile {Utils::FileSystem::getHomePath() + - "/.emulationstation/es_systems.cfg"}; - - if (Utils::FileSystem::exists(legacyConfigFile)) { -#if defined(_WIN64) - LOG(LogInfo) << "Found legacy systems configuration file \"" - << Utils::String::replace(legacyConfigFile, "/", "\\") - << "\", to retain your customizations move it to " - "\"custom_systems\\es_systems.xml\" or otherwise delete the file"; -#else - LOG(LogInfo) << "Found legacy systems configuration file \"" << legacyConfigFile - << "\", to retain your customizations move it to " - "\"custom_systems/es_systems.xml\" or otherwise delete the file"; -#endif - } - } - const std::string& customSystemsDirectory {Utils::FileSystem::getHomePath() + "/.emulationstation/custom_systems"}; @@ -951,7 +933,7 @@ std::vector SystemData::getConfigPath(bool legacyWarning) bool SystemData::createSystemDirectories() { - std::vector configPaths {getConfigPath(true)}; + std::vector configPaths {getConfigPath()}; const std::string& rompath {FileData::getROMDirectory()}; bool onlyProcessCustomFile {false}; diff --git a/es-app/src/SystemData.h b/es-app/src/SystemData.h index 38979a7d6..c72889b56 100644 --- a/es-app/src/SystemData.h +++ b/es-app/src/SystemData.h @@ -109,7 +109,7 @@ public: static void deleteSystems(); // Loads the systems configuration file(s) at getConfigPath() and creates the systems. static bool loadConfig(); - static std::vector getConfigPath(bool legacyWarning); + static std::vector getConfigPath(); // Parses an optional es_systems_sorting.xml file. static void loadSortingConfig();