diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-02-05 19:09:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 19:09:48 +0100 |
| commit | e89a10945c683a1212fa6aa7824173f4f20cdee6 (patch) | |
| tree | 44129c03d20289d0844b7aaae95fed22bbc09b6e /launcher | |
| parent | 8ddc89fa013d5737f94f6c5c63e0ac01780682cf (diff) | |
| parent | c125c96e8851b0386756b34102b97ad87dc13680 (diff) | |
| download | PrismLauncher-e89a10945c683a1212fa6aa7824173f4f20cdee6.tar.gz PrismLauncher-e89a10945c683a1212fa6aa7824173f4f20cdee6.tar.bz2 PrismLauncher-e89a10945c683a1212fa6aa7824173f4f20cdee6.zip | |
Merge pull request #823 from BalkanMadman/linux-java
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 5efbc7a8..e55663aa 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -412,8 +412,6 @@ QList<QString> JavaUtils::FindJavaPaths() #elif defined(Q_OS_LINUX) QList<QString> JavaUtils::FindJavaPaths() { - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - QList<QString> javas; javas.append(this->GetDefaultJava()->path); auto scanJavaDir = [&](const QString & dirPath) @@ -421,20 +419,11 @@ QList<QString> JavaUtils::FindJavaPaths() QDir dir(dirPath); if(!dir.exists()) return; - auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); + auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); for(auto & entry: entries) { - QString prefix; - if(entry.isAbsolute()) - { - prefix = entry.absoluteFilePath(); - } - else - { - prefix = entry.filePath(); - } - + prefix = entry.canonicalFilePath(); javas.append(FS::PathCombine(prefix, "jre/bin/java")); javas.append(FS::PathCombine(prefix, "bin/java")); } |