funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-02-19 07:43:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted ITEM_COLLECTION_NAME, yet again, caused bugs when preloading.

Browse Source
This commit is contained in:
emb 2015-10-28 22:52:44 -05:00
parent 2d188fd2b2
commit ba7a5ebfb9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RetroFE/Source/Database/Configuration.cpp
View File

@ -133,8 +133,11 @@ bool Configuration::parseLine(std::string collection, std::string keyPrefix, std
value = line.substr(position + delimiter.length(), line.length()); value = line.substr(position + delimiter.length(), line.length());
value = trimEnds(value); value = trimEnds(value);
value = Utils::replace(value, "%ITEM_COLLECTION_NAME%", collection);
if(collection != "")
{
value = Utils::replace(value, "%ITEM_COLLECTION_NAME%", collection);
}
properties_.insert(PropertiesPair(key, value)); properties_.insert(PropertiesPair(key, value));
std::stringstream ss; std::stringstream ss;

2
RetroFE/Source/Main.cpp
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(basename, prefix, importFile)) if(!c->import(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);