diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-12 10:03:53 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-12 10:04:33 +0200 |
| commit | 61f72d32b4fddc6e87f21d0243d9f0a32ca61987 (patch) | |
| tree | b166541b885e33666bc3dffbde937b5dc0e93bc5 /src/quick/util/qquickanimatorjob.cpp | |
| parent | 430853836f9c17154ef3ee4cac6b03b90ee493a9 (diff) | |
| parent | 01c6af3fc940378e8eee41a9fb8273420ef5a7e1 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/qml/jsruntime/qv4include.cpp
src/quick/items/qquickrendercontrol.cpp
src/quick/items/qquickrendercontrol_p.h
src/quickwidgets/qquickwidget.cpp
Change-Id: Ib2dc0051a38cd283a37a7665eb4a76f6f7ec8b15
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
| -rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index e7535be1d4..9639129583 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -97,9 +97,11 @@ QQuickAnimatorProxyJob::~QQuickAnimatorProxyJob() void QQuickAnimatorProxyJob::deleteJob() { if (m_job) { - if (m_controller && m_internalState != State_Starting) + // If we have a controller, we might have posted the job to be started + // so delete it through the controller to clean up properly. + if (m_controller) m_controller->deleteJob(m_job); - else if (m_internalState == State_Starting) + else delete m_job; m_job = 0; } |