Merged trunk.
commitb4ca0c434a90390fbb7e402c35b2ea9dedc461e2
authorJussi Pakkanen <jussi.pakkanen@canonical.com>
dateWed 9 Oct 2013, 11:10 (13 years ago)
parent6e003b34cbc62d
plugins/Utils/albumartprovider.cpp+3−2
@@ -210,6 +210,7 @@ QImage AlbumArtProvider::requestImage(const QString &id, QSize *realSize, const
210210 qDebug() << "Unknown error when generating image.";
211211 }
212212
213− *realSize = QSize(0, 0);
214− return QImage(QString::fromStdString(DEFAULT_ALBUM_ART));
213+ QImage fallback(QString::fromStdString(DEFAULT_ALBUM_ART));
214+ *realSize = fallback.size();
215+ return fallback;
215216}