From c42715c250a5f5e97e3bf1348e52ac540ca8b23e Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Fri, 20 Jan 2017 14:52:01 +0100 Subject: [PATCH] Support multiple rompaths using the ; separator for list.path in the collection's settings.conf file. --- .../Source/Collection/CollectionInfoBuilder.cpp | 17 ++++++++++++++++- RetroFE/Source/Version.cpp | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp index fe70cb5..b0a367a 100644 --- a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp +++ b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp @@ -324,7 +324,22 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info, std::string me // Read ROM directory if showMissing is false if (!showMissing || includeFilter.size() == 0) { - ImportRomDirectory(path, info, includeFilter, excludeFilter, romHierarchy); + do + { + std::string rompath; + size_t position = path.find( ";" ); + if(position != std::string::npos) + { + rompath = path.substr(0, position); + path = path.substr(position+1); + } + else + { + rompath = path; + path = ""; + } + ImportRomDirectory(rompath, info, includeFilter, excludeFilter, romHierarchy); + } while (path != ""); } while(includeFilter.size() > 0) diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index 6138631..92ed707 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -20,7 +20,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "7"; -std::string retrofe_version_build = "20b3"; +std::string retrofe_version_build = "20b4"; std::string Version::getString()