summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-12-22 05:31:30 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-12-22 05:31:30 (GMT)
commitad718beb09ec9d4ce2a52712c098185f15eee5e9 (patch)
tree232dde888502f145e5f6aed39d22ce71af65cce0
parent98acb362e4303f058f97812fa8adf791d7ad49a6 (diff)
downloadQt-ad718beb09ec9d4ce2a52712c098185f15eee5e9.zip
Qt-ad718beb09ec9d4ce2a52712c098185f15eee5e9.tar.gz
Qt-ad718beb09ec9d4ce2a52712c098185f15eee5e9.tar.bz2
Don't crash when a subscription is not required
-rw-r--r--src/declarative/qml/qmlbindingvme.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlbindingvme.cpp b/src/declarative/qml/qmlbindingvme.cpp
index 01c7a4b..552dd55 100644
--- a/src/declarative/qml/qmlbindingvme.cpp
+++ b/src/declarative/qml/qmlbindingvme.cpp
@@ -480,8 +480,9 @@ static bool findgeneric(Register *output, // val
if (contextPropertyIndex != -1) {
- subscribe(QmlContextPrivate::get(context), contextPropertyIndex + context->notifyIndex,
- subIdx, config);
+ if (subIdx != -1)
+ subscribe(QmlContextPrivate::get(context), contextPropertyIndex + context->notifyIndex,
+ subIdx, config);
if (contextPropertyIndex < context->idValueCount) {
output->setQObject(context->idValues[contextPropertyIndex]);