From ca535ae1d7621b75635cb940094fdb5a50d79912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Rozier?= <contact@theorozier.fr>
Date: Tue, 16 Apr 2024 19:15:07 +0200
Subject: [PATCH] Improved XML output stream detection! (#209)

---
 portablemc/standard.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/portablemc/standard.py b/portablemc/standard.py
index ac428b29..3d4b22be 100644
--- a/portablemc/standard.py
+++ b/portablemc/standard.py
@@ -1622,14 +1622,14 @@ def process_stream_thread(self, process: Popen) -> None:
         stdout = process.stdout
         assert stdout is not None, "should not be none because it should be piped"
 
-        parser = None
+        parser = StreamParser()
         for line in iter(stdout.readline, ""):
 
-            if parser is None:
-                if line.lstrip().startswith("<log4j:"):
-                    parser = XmlStreamParser()
-                else:
-                    parser = StreamParser()
+            # By default the parser is raw but if we encounter any potential XML tag we
+            # set the parser to the XML one and starting parsing. If it fails immediately
+            # then it reset it to a raw stream parser.
+            if line.lstrip().startswith("<log4j:") and not isinstance(parser, XmlStreamParser):
+                parser = XmlStreamParser()
 
             if not parser.feed(line, self.process_stream_event):
                 parser = StreamParser()