diff options
author | Petr Mrázek <peterix@gmail.com> | 2022-01-08 12:26:16 +0100 |
---|---|---|
committer | swirl <roachh@protonmail.com> | 2022-01-15 16:25:52 -0500 |
commit | f78bb90ed9f2658eee9259a472efe47a25eddc1e (patch) | |
tree | 8729acc7263fffdfe0f5c771cf3a981781f50c89 /launcher/java/JavaChecker.cpp | |
parent | dc129fd8868f1888fcc55136f3cdc2486ae8ab6a (diff) | |
download | PrismLauncher-f78bb90ed9f2658eee9259a472efe47a25eddc1e.tar.gz PrismLauncher-f78bb90ed9f2658eee9259a472efe47a25eddc1e.tar.bz2 PrismLauncher-f78bb90ed9f2658eee9259a472efe47a25eddc1e.zip |
GH-4125 fix it better
Diffstat (limited to 'launcher/java/JavaChecker.cpp')
-rw-r--r-- | launcher/java/JavaChecker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp index c3132af3..4557784b 100644 --- a/launcher/java/JavaChecker.cpp +++ b/launcher/java/JavaChecker.cpp @@ -61,10 +61,6 @@ void JavaChecker::stdoutReady() QByteArray data = process->readAllStandardOutput(); QString added = QString::fromLocal8Bit(data); added.remove('\r'); - // NOTE: workaround for GH-4125, where garbage is getting printed into stdout on bedrock linux - if (added.contains("/bedrock/strata")) { - return; - } m_stdout += added; } @@ -107,6 +103,10 @@ 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()) |