diff options
| author | Jacek Całusiński <forger@forger.pl> | 2013-11-14 17:53:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-15 16:33:46 +0100 |
| commit | e2ca539562fd7fd2eb33c56c5d5d9c0e5196b7af (patch) | |
| tree | 402559966d1884b5737df2cf728ead1bab0d9c61 /src/quick/util/qquickanimation.cpp | |
| parent | 965607836664741db4e33e05792ec4f59c88dc55 (diff) | |
Do not crash when one of group animation's children is null
Check if pointer to QQuickAbstractAnimation for which we are setting
group is valid.
Task-number: QTBUG-34851
Change-Id: Iecb549f080804fd9489f884911fa51892def05a5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/util/qquickanimation.cpp')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 342cf2eaff..f743acc249 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1648,7 +1648,8 @@ QQuickAnimationGroup::QQuickAnimationGroup(QQuickAnimationGroupPrivate &dd, QObj void QQuickAnimationGroupPrivate::append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a) { - if (QQuickAnimationGroup *q = qmlobject_cast<QQuickAnimationGroup *>(list->object)) + QQuickAnimationGroup *q = qmlobject_cast<QQuickAnimationGroup *>(list->object); + if (q && a) a->setGroup(q); } |