fixed possible crash

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9058 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index 981d40e17..f51883f22 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -179,11 +179,11 @@ QList<TrackInfo*> DecoderFLACFactory::createPlayList(const QString &path, TrackI
         //additional metadata
         TagLib::StringList fld;
         if(!(fld = tag->fieldListMap()["ALBUMARTIST"]).isEmpty())
-            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(fld.front()));
+            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(fld.toString()));
         if(!(fld = tag->fieldListMap()["COMPOSER"]).isEmpty())
-            info->setValue(Qmmp::COMPOSER, TStringToQString(fld.front()));
+            info->setValue(Qmmp::COMPOSER, TStringToQString(fld.toString()));
         if(!(fld = tag->fieldListMap()["DISCNUMBER"]).isEmpty())
-            info->setValue(Qmmp::DISCNUMBER, TStringToQString(fld.front()));
+            info->setValue(Qmmp::DISCNUMBER, TStringToQString(fld.toString()));
 
     }
 
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index d55db84d5..2c09b4961 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -195,7 +195,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["ALBUMARTIST"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].front());
+            return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].toString());
     case Qmmp::ALBUM:
         return TStringToQString(m_tag->album());
     case Qmmp::COMMENT:
@@ -206,7 +206,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["COMPOSER"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["COMPOSER"].front());
+            return TStringToQString(m_tag->fieldListMap()["COMPOSER"].toString());
     case Qmmp::YEAR:
         return QString::number(m_tag->year());
     case Qmmp::TRACK:
@@ -215,7 +215,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["DISCNUMBER"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].front());
+            return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].toString());
     }
     return QString();
 }
diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp
index 786cb4a1d..6e62a97a4 100644
--- a/src/plugins/Input/opus/decoderopusfactory.cpp
+++ b/src/plugins/Input/opus/decoderopusfactory.cpp
@@ -80,12 +80,12 @@ QList<TrackInfo *> DecoderOpusFactory::createPlayList(const QString &path, Track
         info->setValue(Qmmp::YEAR, tag->year());
         info->setValue(Qmmp::TRACK, tag->track());
         TagLib::Ogg::FieldListMap items = tag->fieldListMap();
-        if(items.contains("ALBUMARTIST"))
-            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].front()));
-        if(items.contains("COMPOSER"))
-            info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].front()));
-        if(items.contains("DISCNUMBER"))
-            info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].front()));
+        if(!items["ALBUMARTIST"].isEmpty())
+            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].toString()));
+        if(!items["COMPOSER"].isEmpty())
+            info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].toString()));
+        if(!items["DISCNUMBER"].isEmpty())
+            info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].toString()));
     }
 
     if((parts & TrackInfo::Properties) && fileRef.audioProperties())
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index b46025a26..790671788 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -176,7 +176,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["ALBUMARTIST"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].front());
+            return TStringToQString(m_tag->fieldListMap()["ALBUMARTIST"].toString());
     case Qmmp::ALBUM:
         return TStringToQString(m_tag->album());
     case Qmmp::COMMENT:
@@ -187,7 +187,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["COMPOSER"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["COMPOSER"].front());
+            return TStringToQString(m_tag->fieldListMap()["COMPOSER"].toString());
     case Qmmp::YEAR:
         return QString::number(m_tag->year());
     case Qmmp::TRACK:
@@ -196,7 +196,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(m_tag->fieldListMap()["DISCNUMBER"].isEmpty())
             return QString();
         else
-            return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].front());
+            return TStringToQString(m_tag->fieldListMap()["DISCNUMBER"].toString());
     }
     return QString();
 }
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 6ef82b38f..64e33492f 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -83,12 +83,12 @@ QList<TrackInfo *> DecoderVorbisFactory::createPlayList(const QString &path, Tra
         info->setValue(Qmmp::YEAR, tag->year());
         info->setValue(Qmmp::TRACK, tag->track());
         TagLib::Ogg::FieldListMap items = tag->fieldListMap();
-        if(items.contains("ALBUMARTIST"))
-            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].front()));
-        if(items.contains("COMPOSER"))
-            info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].front()));
-        if(items.contains("DISCNUMBER"))
-            info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].front()));
+        if(!items["ALBUMARTIST"].isEmpty())
+            info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].toString()));
+        if(!items["COMPOSER"].isEmpty())
+            info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].toString()));
+        if(!items["DISCNUMBER"].isEmpty())
+            info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].toString()));
     }
 
     if((parts & TrackInfo::Properties) && fileRef.audioProperties())
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 94a49ae59..10901a212 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -162,7 +162,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(tag->fieldListMap()["ALBUMARTIST"].isEmpty())
             return QString();
         else
-            return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].front());
+            return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].toString());
     case Qmmp::ALBUM:
         return TStringToQString(tag->album());
     case Qmmp::COMMENT:
@@ -173,7 +173,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(tag->fieldListMap()["COMPOSER"].isEmpty())
             return QString();
         else
-            return TStringToQString(tag->fieldListMap()["COMPOSER"].front());
+            return TStringToQString(tag->fieldListMap()["COMPOSER"].toString());
     case Qmmp::YEAR:
         return QString::number(tag->year());
     case Qmmp::TRACK:
@@ -182,7 +182,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const
         if(tag->fieldListMap()["DISCNUMBER"].isEmpty())
             return QString();
         else
-            return TStringToQString(tag->fieldListMap()["DISCNUMBER"].front());
+            return TStringToQString(tag->fieldListMap()["DISCNUMBER"].toString());
     }
     return QString();
 }