diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-15 12:22:51 -0600 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-02-15 12:22:51 -0600 |
| commit | bd25ca97297d766bc24fb09e0f95d1bf7d2baf73 (patch) | |
| tree | 85054cfa12c07026c5945ceee5d804fddb6ab35f /src | |
| parent | 6410929e17d642618f284d5c97d457f1ac653e6e (diff) | |
Fix RPATH, absolute instance paths, Proton symlink matching, umu-run logging, pybind11 warning
- Set $ORIGIN-relative RPATH on binaries so they find libs without
LD_LIBRARY_PATH (fixes #12)
- Check QDir::isAbsolutePath before concatenating instance paths to
prevent doubling of custom portable paths
- Canonicalize paths when matching Proton installations to handle
symlinks in /usr/share/steam/compatibilitytools.d/ (fixes #8)
- Add diagnostic logging for umu-run resolution showing preference,
bundled/system paths, and final selection (helps diagnose #8)
- Warn at CMake time if pybind11 >= 2.14 is detected (documents #9)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/instancemanager.cpp | 3 | ||||
| -rw-r--r-- | src/src/protonlauncher.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/src/instancemanager.cpp b/src/src/instancemanager.cpp index 3aa4db5..6620e3c 100644 --- a/src/src/instancemanager.cpp +++ b/src/src/instancemanager.cpp @@ -621,6 +621,9 @@ void InstanceManager::setCurrentInstance(const QString& name) QString InstanceManager::instancePath(const QString& instanceName) const
{
+ if (QDir::isAbsolutePath(instanceName)) {
+ return QDir::fromNativeSeparators(instanceName);
+ }
return QDir::fromNativeSeparators(globalInstancesRootPath() + "/" + instanceName);
}
diff --git a/src/src/protonlauncher.cpp b/src/src/protonlauncher.cpp index 233732f..6a1aecd 100644 --- a/src/src/protonlauncher.cpp +++ b/src/src/protonlauncher.cpp @@ -397,6 +397,9 @@ bool ProtonLauncher::launchWithUmu(qint64& pid) const umuRun = system; } } + + MOBase::log::info("umu-run: preferSystem={}, bundled='{}' (exists={}), system='{}', selected='{}'", + m_preferSystemUmu, bundled, QFileInfo::exists(bundled), system, umuRun); } if (umuRun.isEmpty()) { |
