From 1c67c485c3a0d922ab50801ae20f26f481da7e6f Mon Sep 17 00:00:00 2001
From: emb <>
Date: Tue, 20 Oct 2015 21:13:01 -0500
Subject: [PATCH] Fix %ITEM_FILENAME% replacement for launcher.

---
 RetroFE/Source/Execute/Launcher.cpp | 6 +++---
 RetroFE/Source/Main.cpp             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RetroFE/Source/Execute/Launcher.cpp b/RetroFE/Source/Execute/Launcher.cpp
index a6510dd..53323f0 100644
--- a/RetroFE/Source/Execute/Launcher.cpp
+++ b/RetroFE/Source/Execute/Launcher.cpp
@@ -74,21 +74,21 @@ bool Launcher::run(std::string collection, Item *collectionItem)
     args = replaceVariables(args,
                             selectedItemsPath,
                             collectionItem->name,
-                            collectionItem->filename(),
+                            Utils::getFileName(selectedItemsPath),
                             selectedItemsDirectory,
                             collection);
 
     executablePath = replaceVariables(executablePath,
                                       selectedItemsPath,
                                       collectionItem->name,
-                                      collectionItem->filename(),
+                                      Utils::getFileName(selectedItemsPath),
                                       selectedItemsDirectory,
                                       collection);
 
     currentDirectory = replaceVariables(currentDirectory,
                                         selectedItemsPath,
                                         collectionItem->name,
-                                        collectionItem->filename(),
+                                        Utils::getFileName(selectedItemsPath),
                                         selectedItemsDirectory,
                                         collection);
 
diff --git a/RetroFE/Source/Main.cpp b/RetroFE/Source/Main.cpp
index d14bb6a..519617e 100644
--- a/RetroFE/Source/Main.cpp
+++ b/RetroFE/Source/Main.cpp
@@ -115,7 +115,7 @@ bool ImportConfiguration(Configuration *c)
 
                 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 + "\"");
                     closedir(dp);