projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a93548
)
Add more RETURN_IF_DELETED checking in animation code
author
Charles Yin
<charles.yin@nokia.com>
Thu, 24 May 2012 04:08:20 +0000
(14:08 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Fri, 25 May 2012 01:21:48 +0000
(
03:21
+0200)
Change-Id: I5f77cdc7a6bede547119b2a0b59b41d27cfc401a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
src/qml/animations/qabstractanimationjob.cpp
patch
|
blob
|
history
diff --git
a/src/qml/animations/qabstractanimationjob.cpp
b/src/qml/animations/qabstractanimationjob.cpp
index
52ec00e
..
714012e
100644
(file)
--- a/
src/qml/animations/qabstractanimationjob.cpp
+++ b/
src/qml/animations/qabstractanimationjob.cpp
@@
-355,7
+355,7
@@
void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
if (oldState == Stopped) {
if (isTopLevel) {
// currentTime needs to be updated if pauseTimer is active
-
QQmlAnimationTimer::ensureTimerUpdate(
);
+
RETURN_IF_DELETED(QQmlAnimationTimer::ensureTimerUpdate()
);
RETURN_IF_DELETED(setCurrentTime(m_totalCurrentTime));
}
}