fly/flightgear
1
0
Fork 0
Code Activity

Launcher: reduce warnings loading thumbnail data

Browse source
This commit is contained in:
James Turner 2018-01-30 18:40:41 +00:00
parent b6cd4c8726
commit e4343f4f46
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/GUI/ThumbnailImageItem.cxx
View file

@ -37,8 +37,10 @@ public:
QImage img = QImage::fromData(QByteArray::fromRawData(reinterpret_cast<const char*>(bytes), length));
if (img.isNull()) {
qWarning() << "failed to load image data for URL:" <<
QString::fromStdString(aThumbnailUrl);
if (length > 0) {
// warn if we had valid bytes but couldn't load it, i.e corrupted data or similar
qWarning() << "failed to load image data for URL:" << QString::fromStdString(aThumbnailUrl);
}
return;
}
@ -130,13 +132,15 @@ void ThumbnailImageItem::setAircraftUri(QString uri)
const QString thumbnailPath = aircraftSetPath.dir().filePath("thumbnail.jpg");
m_imageUrl = QUrl::fromLocalFile(thumbnailPath);
QImage img;
if (img.load(thumbnailPath)) {
setImage(img);
} else {
qWarning() << Q_FUNC_INFO << "failed to load thumbnail from:" << thumbnailPath;
if (QFileInfo(thumbnailPath).exists()) {
QImage img;
if (img.load(thumbnailPath)) {
setImage(img);
} else {
qWarning() << Q_FUNC_INFO << "failed to load thumbnail from:" << thumbnailPath;
}
}
}
} // of local aircraft case
emit aircraftUriChanged();
}