Fixed crash on launch close. Fixed launch and rom search paths for merged collections .Removed verbose debug statement.

This commit is contained in:
emb
2015-07-27 21:49:08 -05:00
parent bd1f1657ca
commit f62c4c5e05
4 changed files with 20 additions and 2 deletions

View File

@@ -272,11 +272,19 @@ bool Launcher::extensions(std::string &extensions, std::string collection)
bool Launcher::collectionDirectory(std::string &directory, std::string collection)
{
std::string itemsPathValue;
std::string mergedCollectionName;
// temporarily set currentCollection in case this is a subcollection
config_.getProperty("currentCollection", mergedCollectionName);
config_.setProperty("currentCollection", collection);
// find the items path folder (i.e. ROM path)
config_.getCollectionAbsolutePath(collection, itemsPathValue);
directory += itemsPathValue + Utils::pathSeparator;
// restore old collection name
config_.setProperty("currentCollection", mergedCollectionName);
return true;
}