Fix %ITEM_FILENAME% replacement for launcher.

This commit is contained in:
emb
2015-10-20 21:13:01 -05:00
parent 4d4acca35f
commit 1c67c485c3
2 changed files with 4 additions and 4 deletions

View File

@@ -74,21 +74,21 @@ bool Launcher::run(std::string collection, Item *collectionItem)
args = replaceVariables(args, args = replaceVariables(args,
selectedItemsPath, selectedItemsPath,
collectionItem->name, collectionItem->name,
collectionItem->filename(), Utils::getFileName(selectedItemsPath),
selectedItemsDirectory, selectedItemsDirectory,
collection); collection);
executablePath = replaceVariables(executablePath, executablePath = replaceVariables(executablePath,
selectedItemsPath, selectedItemsPath,
collectionItem->name, collectionItem->name,
collectionItem->filename(), Utils::getFileName(selectedItemsPath),
selectedItemsDirectory, selectedItemsDirectory,
collection); collection);
currentDirectory = replaceVariables(currentDirectory, currentDirectory = replaceVariables(currentDirectory,
selectedItemsPath, selectedItemsPath,
collectionItem->name, collectionItem->name,
collectionItem->filename(), Utils::getFileName(selectedItemsPath),
selectedItemsDirectory, selectedItemsDirectory,
collection); collection);

View File

@@ -115,7 +115,7 @@ bool ImportConfiguration(Configuration *c)
std::string importFile = Utils::combinePath(launchersPath, std::string(dirp->d_name)); std::string importFile = Utils::combinePath(launchersPath, std::string(dirp->d_name));
if(!c->import(prefix, importFile)) if(!c->import(basename, prefix, importFile))
{ {
Logger::write(Logger::ZONE_ERROR, "RetroFE", "Could not import \"" + importFile + "\""); Logger::write(Logger::ZONE_ERROR, "RetroFE", "Could not import \"" + importFile + "\"");
closedir(dp); closedir(dp);