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

@@ -169,12 +169,20 @@ CollectionInfo *CollectionInfoBuilder::buildCollection(std::string name)
std::string extensions;
std::string metadataType = name;
std::string metadataPath;
std::string mergedCollectionName;
// temporarily set currentCollection in case this is a subcollection
conf_.getProperty("currentCollection", mergedCollectionName);
conf_.setProperty("currentCollection", name);
conf_.getCollectionAbsolutePath(name, listItemsPath);
(void)conf_.getProperty(extensionsKey, extensions);
(void)conf_.getProperty(metadataTypeKey, metadataType);
(void)conf_.getProperty(metadataPathKey, metadataPath);
// restore old collection name
conf_.setProperty("currentCollection", mergedCollectionName);
if(!conf_.getProperty(launcherKey, launcherName))
{
std::stringstream ss;