diff options
| author | timoreo22 <timo.oreo34@gmail.com> | 2022-01-28 18:12:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 18:12:35 +0100 |
| commit | 8b790a6dd94a7b779b72595f1e1567eda9877e86 (patch) | |
| tree | 4ebc2ca7aebfb31f58ecaaeca0d7b15122b53623 /launcher/java | |
| parent | 1d0e6bf453bfee0d9201fabf1e979ab0aca90418 (diff) | |
| parent | f36930d81227f70046f7428b0ba41229b00687b4 (diff) | |
| download | PrismLauncher-8b790a6dd94a7b779b72595f1e1567eda9877e86.tar.gz PrismLauncher-8b790a6dd94a7b779b72595f1e1567eda9877e86.tar.bz2 PrismLauncher-8b790a6dd94a7b779b72595f1e1567eda9877e86.zip | |
Merge branch 'PolyMC:develop' into feature/download_mods
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaChecker.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp index 80c599cc..35ddc35c 100644 --- a/launcher/java/JavaChecker.cpp +++ b/launcher/java/JavaChecker.cpp @@ -103,11 +103,15 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status) for(QString line : lines) { line = line.trimmed(); + // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux + if (line.contains("/bedrock/strata")) { + continue; + } auto parts = line.split('=', QString::SkipEmptyParts); if(parts.size() != 2 || parts[0].isEmpty() || parts[1].isEmpty()) { - success = false; + continue; } else { |