From 2e9dc6c57049d3dca5af0f8cbc91c7861b60fee1 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Thu, 3 Jun 2010 15:22:30 +0000
Subject: [PATCH] Never override UTF-8 strings from TagLib.

---
 src/core/song.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/song.cpp b/src/core/song.cpp
index c83adee1d..f0391428c 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -305,7 +305,7 @@ void Song::Init(const QString& title, const QString& artist, const QString& albu
 }
 
 QString Song::Decode(const TagLib::String& tag, const QTextCodec* codec) {
-  if (codec) {
+  if (codec && tag.isLatin1()) {  // Never override UTF-8.
     const std::string fixed = QString::fromUtf8(tag.toCString(true)).toStdString();
     return codec->toUnicode(fixed.c_str()).trimmed();
   } else {