From c5f6c25e933eaafbfe655acab4efd7d6c0ccd1a3 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sun, 27 May 2012 17:34:03 +0200
Subject: [PATCH] * Added coverLoaded() method to Query.

---
 src/libtomahawk/Query.cpp | 15 ++++++++++++++-
 src/libtomahawk/Query.h   |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp
index 94cd4a140..246664450 100644
--- a/src/libtomahawk/Query.cpp
+++ b/src/libtomahawk/Query.cpp
@@ -780,7 +780,7 @@ Query::cover( const QSize& size, bool forceLoad ) const
     }
 
     m_albumPtr->cover( size, forceLoad );
-    if ( m_albumPtr->infoLoaded() )
+    if ( m_albumPtr->coverLoaded() )
     {
         if ( !m_albumPtr->cover( size ).isNull() )
             return m_albumPtr->cover( size );
@@ -793,6 +793,19 @@ Query::cover( const QSize& size, bool forceLoad ) const
 #endif
 
 
+bool
+Query::coverLoaded() const
+{
+    if ( m_albumPtr.isNull() )
+        return false;
+    
+    if ( m_albumPtr->coverLoaded() && !m_albumPtr->cover( QSize( 0, 0 ) ).isNull() )
+        return true;
+    
+    return m_artistPtr->coverLoaded();
+}
+
+
 QList<Tomahawk::query_ptr>
 Query::similarTracks() const
 {
diff --git a/src/libtomahawk/Query.h b/src/libtomahawk/Query.h
index 78ff182f8..20e9956d7 100644
--- a/src/libtomahawk/Query.h
+++ b/src/libtomahawk/Query.h
@@ -145,6 +145,7 @@ public:
 #ifndef ENABLE_HEADLESS
     QPixmap cover( const QSize& size, bool forceLoad = true ) const;
 #endif
+    bool coverLoaded() const;
 
     void setResolveFinished( bool resolved ) { m_resolveFinished = resolved; }
     void setPlayedBy( const Tomahawk::source_ptr& source, unsigned int playtime );