From e96bbc11e1bc9d0503a20bdfd79e56cc3cbb2688 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 1 Jul 2012 08:56:57 +0200 Subject: [PATCH] * Fixed cover loading in error case. --- src/libtomahawk/Album.cpp | 10 +++++++--- src/libtomahawk/Artist.cpp | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/libtomahawk/Album.cpp b/src/libtomahawk/Album.cpp index 48b2b6166..70ae122a5 100644 --- a/src/libtomahawk/Album.cpp +++ b/src/libtomahawk/Album.cpp @@ -174,10 +174,14 @@ Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, return; } - m_coverLoaded = true; - - if ( !output.isNull() && output.isValid() ) + if ( output.isNull() ) { + m_coverLoaded = true; + } + else if ( output.isValid() ) + { + m_coverLoaded = true; + QVariantMap returnedData = output.value< QVariantMap >(); const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index ebcbcb526..ea5b34790 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -315,9 +315,14 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari case Tomahawk::InfoSystem::InfoArtistImages: { - m_coverLoaded = true; - if ( !output.isNull() && output.isValid() ) + if ( output.isNull() ) { + m_coverLoaded = true; + } + else if ( output.isValid() ) + { + m_coverLoaded = true; + const QByteArray ba = returnedData["imgbytes"].toByteArray(); if ( ba.length() ) {