funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-16 11:48:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

MLaunching merged romset support

Browse Source
This commit is contained in:
emb 2015-10-19 21:59:40 -05:00
parent c5c8499500
commit 1785c008a1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RetroFE/Source/Execute/Launcher.cpp
View File

@ -67,11 +67,10 @@ bool Launcher::run(std::string collection, Item *collectionItem)
Logger::write(Logger::ZONE_ERROR, "Launcher", "No launcher arguments specified for launcher " + launcherName); Logger::write(Logger::ZONE_ERROR, "Launcher", "No launcher arguments specified for launcher " + launcherName);
return false; return false;
} }
if(!findFile(selectedItemsPath, matchedExtension, selectedItemsDirectory, collectionItem->name, extensionstr))
{ // It is ok to continue if the file could not be found. We could be launching a merged romset
// FindFile() prints out diagnostic messages for us, no need to print anything here findFile(selectedItemsPath, matchedExtension, selectedItemsDirectory, collectionItem->name, extensionstr);
return false;
}
args = replaceVariables(args, args = replaceVariables(args,
selectedItemsPath, selectedItemsPath,
collectionItem->name, collectionItem->name,
@ -329,7 +328,7 @@ bool Launcher::findFile(std::string &foundFilePath, std::string &foundFilename,
<< filenameWithoutExtension << "\" in folder \"" << filenameWithoutExtension << "\" in folder \""
<< directory; << directory;
Logger::write(Logger::ZONE_ERROR, "Launcher", ss.str()); Logger::write(Logger::ZONE_WARNING, "Launcher", ss.str());
} }