aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2022-01-08 12:26:16 +0100
committerPetr Mrázek <peterix@gmail.com>2022-01-08 12:26:16 +0100
commit52420963cf1f258f14cedd7ff41412338d73b369 (patch)
treeab60870daa04a9325fddc368b5d6a1e7ca689d3f
parentaddf5f4e52cf869375e2803afa0fa14dbaf71b22 (diff)
downloadPrismLauncher-52420963cf1f258f14cedd7ff41412338d73b369.tar.gz
PrismLauncher-52420963cf1f258f14cedd7ff41412338d73b369.tar.bz2
PrismLauncher-52420963cf1f258f14cedd7ff41412338d73b369.zip
GH-4125 fix it better
-rw-r--r--launcher/java/JavaChecker.cpp8
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())