1 files changed, 17 insertions, 6 deletions
diff --git a/src/track/taglib/trackmetadata_common.cpp b/src/track/taglib/trackmetadata_common.cpp
index d813ed42e4..a45cf625d1 100644
--- a/src/track/taglib/trackmetadata_common.cpp
+++ b/src/track/taglib/trackmetadata_common.cpp
@@ -56,14 +56,25 @@ bool parseReplayGainPeak(
 
 namespace taglib {
 
+QString toQString(
+        const TagLib::String& tString) {
+    if (tString.isEmpty()) {
+        // TagLib::null/isNull() is deprecated so we cannot distinguish
+        // between null and empty strings.
+        return QString();
+    }
+    return TStringToQString(tString);
+}
+
 TagLib::String toTString(
-        const QString& str) {
-    if (str.isNull()) {
-        return TagLib::String::null;
-    } else {
-        const QByteArray qba(str.toUtf8());
-        return TagLib::String(qba.constData(), TagLib::String::UTF8);
+        const QString& qString) {
+    if (qString.isEmpty()) {
+        // TagLib::null/isNull() is deprecated so we cannot distinguish
+        // between null and empty strings.
+        return TagLib::String();
     }
+    const QByteArray qba(qString.toUtf8());
+    return TagLib::String(qba.constData(), TagLib::String::UTF8);
 }
 
 TagLib::String firstNonEmptyStringListItem(