diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-12 03:56:44 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-12 03:57:44 (GMT) |
| commit | 29450fd82c2c8efdc296a051f6a8fac2bd3fa76a (patch) | |
| tree | 371956a8a7789ef0a6ee615fbe93a2446971cea7 /src/declarative/util | |
| parent | b3a06e47bc66c36de8558ab7bc9817ed2518ae9c (diff) | |
| download | Qt-29450fd82c2c8efdc296a051f6a8fac2bd3fa76a.zip Qt-29450fd82c2c8efdc296a051f6a8fac2bd3fa76a.tar.gz Qt-29450fd82c2c8efdc296a051f6a8fac2bd3fa76a.tar.bz2 | |
Avoid warning (and possible future crash) upon reload.
Task-number: QTBUG-10555
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativexmllistmodel.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index f02ed16..f1a00989 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -796,8 +796,11 @@ void QDeclarativeXmlListModel::reload() if (d->reply) { d->reply->abort(); - d->reply->deleteLater(); - d->reply = 0; + if (d->reply) { + // abort will generally have already done this (and more) + d->reply->deleteLater(); + d->reply = 0; + } } if (!d->xml.isEmpty()) { |