Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors

1 files changed, 8 insertions, 7 deletions

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index a3e8c9a9be..3fc47d469c 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -13,7 +13,7 @@
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
-#include "library/coverartcache.h"
+#include "library/coverartutils.h"
 #include "library/crate/cratefeaturehelper.h"
 #include "library/dao/trackschema.h"
 #include "library/dlgtagfetcher.h"
@@ -2166,21 +2166,22 @@ void WTrackTableView::slotCoverInfoSelected(const CoverInfoRelative& coverInfo)
 
 void WTrackTableView::slotReloadCoverArt() {
     TrackModel* trackModel = getTrackModel();
-    if (trackModel == nullptr) {
+    if (!trackModel) {
         return;
     }
-    QList<TrackPointer> selectedTracks;
     const QModelIndexList selection = selectionModel()->selectedRows();
+    if (selection.isEmpty()) {
+        return;
+    }
+    QList<TrackPointer> selectedTracks;
+    selectedTracks.reserve(selection.size());
     for (const QModelIndex& index : selection) {
         TrackPointer pTrack = trackModel->getTrack(index);
         if (pTrack) {
             selectedTracks.append(pTrack);
         }
     }
-    CoverArtCache* pCache = CoverArtCache::instance();
-    if (pCache) {
-        pCache->requestGuessCovers(selectedTracks);
-    }
+    guessTrackCoverInfoConcurrently(selectedTracks);
 }
 
 void WTrackTableView::slotSortingChanged(int headerSection, Qt::SortOrder order) {