diff options
| author | Nick Shaforostov <mshaforostov@airmusictech.com> | 2019-05-08 11:54:00 +0200 |
|---|---|---|
| committer | Nick Shaforostov <mshaforostov@airmusictech.com> | 2020-03-26 20:49:18 +0000 |
| commit | d94bb1f6795302ef6eec795dd3ad92d60bd2aa4d (patch) | |
| tree | f27be585a7cb39149ab588c236c0f5b601d45eb5 | |
| parent | 92fc8e4cb82aaa0e2996e38d8e16317e5cb8f972 (diff) | |
Flickable: add nullptr check (crash seen only in release mode on windows)
Change-Id: I2ac42ded0c2ed4dc3937a57f69109f10b19f9cc7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 52f7c29aa4..445fa0215b 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1909,6 +1909,9 @@ void QQuickFlickable::cancelFlick() void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o) { + if (!prop || !prop->data) + return; + if (QQuickItem *i = qmlobject_cast<QQuickItem *>(o)) { i->setParentItem(static_cast<QQuickFlickablePrivate*>(prop->data)->contentItem); } else if (QQuickPointerHandler *pointerHandler = qmlobject_cast<QQuickPointerHandler *>(o)) { |