From b0fcd78e9f4968638be5cbf8e46fc21846bbecba Mon Sep 17 00:00:00 2001 From: James Turner Date: Fri, 25 Nov 2016 22:53:06 +0000 Subject: [PATCH] Fix lazy-loaded thumbnail size for aircraft dirs. --- src/GUI/AircraftModel.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/GUI/AircraftModel.cxx b/src/GUI/AircraftModel.cxx index bafa69b7d..3ab11bb17 100644 --- a/src/GUI/AircraftModel.cxx +++ b/src/GUI/AircraftModel.cxx @@ -627,7 +627,11 @@ QVariant AircraftItemModel::dataFromItem(AircraftItemPtr item, const DelegateSta } if (role == AircraftThumbnailSizeRole) { - return item->thumbnail(false).size(); + QPixmap pm = item->thumbnail(false); + if (pm.isNull()) { + return QSize(STANDARD_THUMBNAIL_WIDTH, STANDARD_THUMBNAIL_HEIGHT); + } + return pm.size(); } if ((role >= AircraftVariantDescriptionRole) && (role < AircraftThumbnailRole)) {