From a6a0dfc44e729f6a9e772beec1b7fd176051da4b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 4 May 2011 14:43:16 +1000 Subject: [PATCH] Fix crashing QtQuick 1 Image elements. --- src/declarative/util/qdeclarativepixmapcache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index dcce7db..f0e999b 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -289,7 +289,7 @@ void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorStr } QDeclarativePixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSize, const QImage &i) - : QEvent(QEvent::User), error(e), errorString(s), implicitSize(iSize), image(i) + : QEvent(QEvent::User), error(e), errorString(s), implicitSize(iSize), image(i), texture(0), context(0) { } @@ -793,7 +793,7 @@ bool QDeclarativePixmapReply::event(QEvent *event) if (data) { Event *de = static_cast(event); data->pixmapStatus = (de->error == NoError) ? QDeclarativePixmap::Ready : QDeclarativePixmap::Error; - + if (data->pixmapStatus == QDeclarativePixmap::Ready) { if (de->texture) { data->texture = de->texture; -- 2.7.4