feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revertlist for states are now skipped if the state is destroying.

Browse Source 
Task-Number: BAUHAUS-636
Reviewed-by: kkoehne
This commit is contained in:
Marco Bubke
2010-04-26 19:16:06 +02:00
committed by Kai Koehne
parent edb13d3381
commit bc26b917b9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
View File

@@ -252,7 +252,7 @@ QDeclarativeStateGroup *QmlPropertyChangesObject::stateGroup() const
QDeclarativeStatePrivate *QmlPropertyChangesObject::statePrivate() const
{
if (!parent())
if (!parent() || QObjectPrivate::get(parent())->wasDeleted)
return 0;
Q_ASSERT(qobject_cast<QDeclarativeState*>(parent()));
@@ -350,12 +350,13 @@ void QmlPropertyChangesObject::removeFromStateRevertList()
while(simpleActionIterator.hasNext()) {
QDeclarativeSimpleAction &simpleAction = simpleActionIterator.next();
if (simpleAction.specifiedObject == targetObject()) {
Q_ASSERT(simpleAction.property.isValid());
if (simpleAction.binding) {
QDeclarativePropertyPrivate::setBinding(simpleAction.property, simpleAction.binding);
} else if (simpleAction.value.isValid()) {
QDeclarativePropertyPrivate::setBinding(simpleAction.property, 0);
simpleAction.property.write(simpleAction.value);
if (simpleAction.property.isValid()) {
if (simpleAction.binding) {
QDeclarativePropertyPrivate::setBinding(simpleAction.property, simpleAction.binding);
} else if (simpleAction.value.isValid()) {
QDeclarativePropertyPrivate::setBinding(simpleAction.property, 0);
simpleAction.property.write(simpleAction.value);
}
}
simpleActionIterator.remove();
}