Emulation/EmulationStation-retropie
1
0
Fork 0
mirror of https://github.com/RetroPie/EmulationStation.git synced 2024-05-31 18:47:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #863 from Gemba/fix_861_nested_gamelaunch_files

Browse source 
Fix for nested game launchers
This commit is contained in:
pjft 2024-02-21 21:09:01 +00:00 committed by GitHub
parent 3ed0ac6e83 60a116708e
commit 4094f8af03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
es-app/src/Gamelist.cpp
View file

@ -56,8 +56,12 @@ FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType
FileData* file = new FileData(type, path, system->getSystemEnvData(), system);
// skipping arcade assets from gamelist
if(!file->isArcadeAsset())
// skipping arcade assets from gamelist and add only to filesystem
// (fs) folders, i.e. entriess in gamelist with <folder/> and not to
// fs-folders which are marked as <game/> in gamelist. NB:
// treeNode's type (=parent) is determined by the element in the
// gamelist and not by the fs-type.
if(!file->isArcadeAsset() && treeNode->getType() == FOLDER)
{
treeNode->addChild(file);
}
@ -74,7 +78,14 @@ FileData* findOrCreateFile(SystemData* system, const std::string& path, FileType
LOG(LogWarning) << "gameList: folder " << absFolder << " absent on fs, no FileData object created. Do remove leftover in gamelist.xml to remediate this warning.";
return NULL;
}
// discard constellations like scummvm/game.svm/game.svm as
// scummvm/game.svm/ is a GAME and not a FOLDER
if (treeNode->getType() == GAME)
{
std::string absFolder = Utils::FileSystem::getAbsolutePath(pathSegment, systemPath);
LOG(LogWarning) << "gameList: trying to add game '" << absFolder << "' to a parent <game/> entry is invalid, no FileData object created. Do remove nested <game/> in gamelist.xml to remediate this warning.";
return NULL;
}
// create folder filedata object
std::string absPath = Utils::FileSystem::resolveRelativePath(treeNode->getPath() + "/" + pathSegment, systemPath, false, true);
FileData* folder = new FileData(FOLDER, absPath, system->getSystemEnvData(), system);