fly/flightgear
1
0
Fork 0
Code Activity

Fix crash with Qt < 5.9 in thumbnail items.

Browse source 
Qt 5.4, etc will work now
This commit is contained in:
James Turner 2017-10-09 10:37:50 +01:00
parent 907420d3f4
commit 2e37fabd80
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/GUI/ThumbnailImageItem.cxx
View file

@ -48,7 +48,8 @@ public:
ThumbnailImageItem* owner;
};
ThumbnailImageItem::ThumbnailImageItem() :
ThumbnailImageItem::ThumbnailImageItem(QQuickItem* parent) :
QQuickItem(parent),
m_delegate(new ThumbnailPackageDelegate(this)),
m_maximumSize(9999, 9999)
{
@ -66,18 +67,20 @@ ThumbnailImageItem::~ThumbnailImageItem()
QSGNode *ThumbnailImageItem::updatePaintNode(QSGNode* oldNode, QQuickItem::UpdatePaintNodeData *)
{
if (m_image.isNull()) {
delete oldNode;
return nullptr;
}
QSGSimpleTextureNode* textureNode = static_cast<QSGSimpleTextureNode*>(oldNode);
if (!textureNode) {
textureNode = new QSGSimpleTextureNode;
textureNode->setOwnsTexture(true);
}
if (m_imageDirty || !textureNode) {
if (!textureNode) {
textureNode = new QSGSimpleTextureNode;
textureNode->setOwnsTexture(true);
}
if (m_imageDirty && !m_image.isNull()) {
QSGTexture* tex = window()->createTextureFromImage(m_image);
textureNode->setTexture(tex);
textureNode->markDirty(QSGBasicGeometryNode::DirtyMaterial);
m_imageDirty = false;
}

2
src/GUI/ThumbnailImageItem.hxx
View file

@ -18,7 +18,7 @@ class ThumbnailImageItem : public QQuickItem
Q_PROPERTY(QSize maximumSize READ maximumSize WRITE setMaximumSize NOTIFY maximumSizeChanged)
public:
ThumbnailImageItem();
ThumbnailImageItem(QQuickItem* parent = nullptr);
~ThumbnailImageItem();
QSGNode* updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;