ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2760 from Trial97/mangohid

Browse Source 
fix mangohud detection for absolute path
This commit is contained in:
timoreo 2024-08-29 06:24:09 +02:00 committed by GitHub
commit 828acef7e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
launcher/MangoHud.cpp
View File

@ -108,24 +108,31 @@ QString getLibraryString()
if (filePath.isEmpty()) { if (filePath.isEmpty()) {
continue; continue;
} }
try {
auto conf = Json::requireDocument(filePath, vkLayer);
auto confObject = Json::requireObject(conf, vkLayer);
auto layer = Json::ensureObject(confObject, "layer");
QString libraryName = Json::ensureString(layer, "library_path");
auto conf = Json::requireDocument(filePath, vkLayer); if (libraryName.isEmpty()) {
auto confObject = Json::requireObject(conf, vkLayer); continue;
auto layer = Json::ensureObject(confObject, "layer"); }
QString libraryName = Json::ensureString(layer, "library_path"); if (QFileInfo(libraryName).isAbsolute()) {
return libraryName;
}
#ifdef __GLIBC__ #ifdef __GLIBC__
// Check whether mangohud is usable on a glibc based system // Check whether mangohud is usable on a glibc based system
if (!libraryName.isEmpty()) {
QString libraryPath = findLibrary(libraryName); QString libraryPath = findLibrary(libraryName);
if (!libraryPath.isEmpty()) { if (!libraryPath.isEmpty()) {
return libraryPath; return libraryPath;
} }
}
#else #else
// Without glibc return recorded shared library as-is. // Without glibc return recorded shared library as-is.
return libraryName; return libraryName;
#endif #endif
} catch (const Exception& e) {
}
} }
return {}; return {};