From df8a183c76095973e2b3b410128d075cf1f56c38 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 11 Jun 2018 12:41:42 +0000 Subject: fixed regression git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8023 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/fileloader.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/qmmpui/fileloader.cpp') diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index e7eab5a0b..e11f14fdf 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -61,8 +61,7 @@ void FileLoader::insertPlayList(const QString &fmt, const QByteArray &contents, while (!tracks.isEmpty() && !m_finished) { PlayListTrack *t = tracks.takeFirst(); - QList infoList = MetaDataManager::instance()->createPlayList(t->path(), - m_parts ? TrackInfo::MetaData : TrackInfo::NoParts); + QList infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts); if(infoList.count() != 1) //invalid or unsupported track { qDeleteAll(infoList); @@ -90,7 +89,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) while (!tracks.isEmpty() && !m_finished) { PlayListTrack *t = tracks.takeFirst(); - QList infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts ? TrackInfo::MetaData : TrackInfo::NoParts); + QList infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts); if(infoList.count() != 1) //invalid or unsupported track { qDeleteAll(infoList); @@ -99,11 +98,11 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) continue; } - TrackInfo *info = infoList.first(); + TrackInfo *info = infoList.takeFirst(); if(!info->value(Qmmp::ALBUM).isEmpty() && !info->value(Qmmp::ARTIST).isEmpty()) - t->updateMetaData(infoList.first()); + t->updateMetaData(info); - emit newTracksToInsert(before, QList() << t); + emit newTracksToInsert(before, QList() << t); //TODO optimization delete info; } //clear remaining tracks -- cgit v1.2.3-13-gbd6f