diff options
| -rw-r--r-- | src/quick/items/qquickanimatedimage.cpp | 16 | ||||
| -rw-r--r-- | tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp | 28 |
2 files changed, 39 insertions, 5 deletions
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp index 26dfdb07a6..075c4a7d72 100644 --- a/src/quick/items/qquickanimatedimage.cpp +++ b/src/quick/items/qquickanimatedimage.cpp @@ -426,15 +426,18 @@ void QQuickAnimatedImage::movieRequestFinished() } bool pausedAtStart = d->paused; - if (d->playing) + if (d->movie && d->playing) d->movie->start(); - if (pausedAtStart) + if (d->movie && pausedAtStart) d->movie->setPaused(true); - if (d->paused || !d->playing) { + if (d->movie && (d->paused || !d->playing)) { d->movie->jumpToFrame(d->presetCurrentFrame); d->presetCurrentFrame = 0; } - d->setPixmap(*d->infoForCurrentFrame(qmlEngine(this))); + + QQuickPixmap *pixmap = d->infoForCurrentFrame(qmlEngine(this)); + if (pixmap) + d->setPixmap(*pixmap); if (isPlaying() != d->oldPlaying) emit playingChanged(); @@ -512,7 +515,10 @@ void QQuickAnimatedImagePrivate::setMovie(QMovie *m) Q_Q(QQuickAnimatedImage); const int oldFrameCount = q->frameCount(); - delete movie; + if (movie) { + movie->disconnect(); + movie->deleteLater(); + } movie = m; if (oldFrameCount != q->frameCount()) diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp index 3e5a054cc7..8026bafb9e 100644 --- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -67,6 +67,7 @@ private slots: void progressAndStatusChanges(); void playingAndPausedChanges(); void noCaching(); + void sourceChangesOnFrameChanged(); }; void tst_qquickanimatedimage::cleanup() @@ -590,6 +591,33 @@ void tst_qquickanimatedimage::noCaching() } } +void tst_qquickanimatedimage::sourceChangesOnFrameChanged() +{ + QQmlEngine engine; + QQmlComponent component(&engine, testFileUrl("colors.qml")); + QVector<QQuickAnimatedImage*> images; + + // Run multiple animations in parallel, this should be fast + for (int loops = 0; loops < 25; ++loops) { + QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create()); + + // QTBUG-67427: this should not produce a segfault + QObject::connect(anim, + &QQuickAnimatedImage::frameChanged, + [this, anim]() { anim->setSource(testFileUrl("hearts.gif")); }); + + QVERIFY(anim); + QVERIFY(anim->isPlaying()); + + images.append(anim); + } + + for (auto *anim : images) + QTRY_COMPARE(anim->source(), testFileUrl("hearts.gif")); + + qDeleteAll(images); +} + QTEST_MAIN(tst_qquickanimatedimage) #include "tst_qquickanimatedimage.moc" |