From 481663c185b000f1121d35aaa40a359660dd6cfd Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jholthuis@mixxx.org>
Date: Sat, 15 Jan 2022 12:14:58 +0100
Subject: SeratoMarkers2: Always skip trailing null byte when parsing string

This should be done explicitly instead of depending on this behavior
detail of QString::fromUtf8(), because it changes in Qt6.
---
 src/track/serato/markers2.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/track/serato/markers2.cpp b/src/track/serato/markers2.cpp
index 07b4a62566..0f746a6574 100644
--- a/src/track/serato/markers2.cpp
+++ b/src/track/serato/markers2.cpp
@@ -26,7 +26,9 @@ QString zeroTerminatedUtf8StringtoQString(QDataStream* stream) {
     quint8 byte = '\xFF';
     while (byte != '\x00') {
         *stream >> byte;
-        data.append(byte);
+        if (byte != '\x00') {
+            data.append(byte);
+        }
         if (stream->status() != QDataStream::Status::Ok) {
             return QString();
         }
-- 
cgit v1.2.3