Added cachedOnly flag to LoadCoverArtSignal

4 files changed, 10 insertions, 8 deletions

diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 3d22803616..5aaff9fed2 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -96,7 +96,7 @@ void WCoverArt::slotPixmapFound(int trackId, QPixmap pixmap) {
 
 void WCoverArt::slotLoadCoverArt(const QString& coverLocation,
                                  const QString& md5Hash,
-                                 int trackId) {
+                                 int trackId, bool cachedOnly) {
     if (!m_bEnableWidget) {
         return;
     }
@@ -157,7 +157,7 @@ void WCoverArt::resizeEvent(QResizeEvent*) {
         setMinimumSize(0, parentWidget()->height() / 3);
         slotLoadCoverArt(m_lastRequestedCover.first,
                          m_lastRequestedCover.second,
-                         m_lastRequestedTrackId);
+                         m_lastRequestedTrackId, true);
      } else {
         m_loadedCover = CoverArtCache::instance()->getDefaultCoverArt();
         setMinimumSize(0, 20);
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index 8b27cf7486..f3c6b407a1 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -25,7 +25,7 @@ class WCoverArt : public QWidget, public WBaseWidget {
     void slotEnableWidget(bool);
     void slotLoadCoverArt(const QString& coverLocation,
                           const QString& md5Hash,
-                          int trackId);
+                          int trackId, bool cachedOnly);
 
   private slots:
     void slotPixmapFound(int trackId, QPixmap pixmap);
diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h
index 7dc6c43103..7f6da1f9b5 100644
--- a/src/widget/wlibrarytableview.h
+++ b/src/widget/wlibrarytableview.h
@@ -24,8 +24,10 @@ class WLibraryTableView : public QTableView, public virtual LibraryView {
 
   signals:
     void loadTrack(TrackPointer pTrack);
-    void loadTrackToPlayer(TrackPointer pTrack, QString group, bool play = false);
-    void loadCoverArt(const QString& coverLocation, const QString&, int trackId);
+    void loadTrackToPlayer(TrackPointer pTrack, QString group,
+            bool play = false);
+    void loadCoverArt(const QString& coverLocation, const QString&,
+            int trackId, bool cachedOnly);
     void onlyCachedCoverArt(bool);
     void scrollValueChanged(int);
 
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 3ac51ac345..1cb0f158e8 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -172,6 +172,8 @@ void WTrackTableView::slotGuiTickTime(double cpuTime) {
     if (!m_bLastCoverLoaded) {
         if (cpuTime >= m_lastSelection + 0.05) {
             slotLoadCoverArt();
+            // it will allows CoverCache to load and search covers normally
+            emit(onlyCachedCoverArt(false));
             m_bLastCoverLoaded = true;
         }
     }
@@ -196,9 +198,7 @@ void WTrackTableView::slotLoadCoverArt() {
                                 m_iCoverLocationColumn).data().toString();
         }
     }
-    emit(loadCoverArt(coverLocation, md5Hash, trackId));
-    // it will allows CoverCache to load and search covers normally
-    emit(onlyCachedCoverArt(false));
+    emit(loadCoverArt(coverLocation, md5Hash, trackId, false));
 }
 
 // slot