summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@nokia.com>2010-04-20 14:30:28 +0200
committercon <qtc-committer@nokia.com>2010-04-20 16:31:37 +0200
commit88ac18520ac2c264ed0a192017ac7ba953ae751e (patch)
treea7f1824831d1bc2c30eb77aa4a325c5646200e9b
parent47d1931bcc2fd8d173b03b98381361359b2c170a (diff)
downloadqt-creator-88ac18520ac2c264ed0a192017ac7ba953ae751e.tar.gz
Fix crash for reseting a property
Task-Number: BAUHAUS-606 (cherry picked from commit 212afcfa921c0ef3fac938de221a60277de56d3c)
-rw-r--r--src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
index 67e7538a3f..f24bfa6673 100644
--- a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
@@ -296,11 +296,13 @@ void QmlPropertyChangesObject::removeActionForProperty(const QString &propertyNa
actionIterator.remove();
}
- QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
- while (simpleActionIterator.hasNext()) {
- QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
- if (qmlSimpleAction.specifiedProperty == propertyName && qmlSimpleAction.specifiedObject == targetObject()) {
- simpleActionIterator.remove();
+ if (statePrivate()) {
+ QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
+ while (simpleActionIterator.hasNext()) {
+ QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
+ if (qmlSimpleAction.specifiedProperty == propertyName && qmlSimpleAction.specifiedObject == targetObject()) {
+ simpleActionIterator.remove();
+ }
}
}
}