mirror of
https://github.com/FunKey-Project/RetroFE.git
synced 2026-04-01 17:53:07 +02:00
Fix %ITEM_FILENAME% replacement for launcher.
This commit is contained in:
@@ -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);
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user