Merge pull request #1508 from comp500/fix/allow-empty-lines

PrismLauncher · Aug 15, 2023 · a360ddb · a360ddb
2 parents 7ba1e7d + 1c3449e
commit a360ddb
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp
@@ -65,14 +65,9 @@ QStringList LoggedProcess::reprocess(const QByteArray& data, QTextDecoder& decod
         m_leftover_line = "";
     }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, QString::SkipEmptyParts);
-#else
-    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed, Qt::SkipEmptyParts);
-#endif
-
-    if (!str.endsWith(QChar::LineFeed))
-        m_leftover_line = lines.takeLast();
+    auto lines = str.remove(QChar::CarriageReturn).split(QChar::LineFeed);
+
+    m_leftover_line = lines.takeLast();
     return lines;
 }