diff options
Diffstat (limited to 'src/quick/util/qquickanimation.cpp')
| -rw-r--r-- | src/quick/util/qquickanimation.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index 3a5674f171..2fca7ba80c 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -937,15 +937,17 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action d->hasRunScriptScript = false; d->reversing = (direction == Backward); - for (int ii = 0; ii < actions.count(); ++ii) { - QQuickAction &action = actions[ii]; - - if (action.event && action.event->type() == QQuickActionEvent::Script - && static_cast<QQuickStateChangeScript*>(action.event)->name() == d->name) { - d->runScriptScript = static_cast<QQuickStateChangeScript*>(action.event)->script(); - d->hasRunScriptScript = true; - action.actionDone = true; - break; //only match one (names should be unique) + if (!d->name.isEmpty()) { + for (int ii = 0; ii < actions.count(); ++ii) { + QQuickAction &action = actions[ii]; + + if (action.event && action.event->type() == QQuickActionEvent::Script + && static_cast<QQuickStateChangeScript*>(action.event)->name() == d->name) { + d->runScriptScript = static_cast<QQuickStateChangeScript*>(action.event)->script(); + d->hasRunScriptScript = true; + action.actionDone = true; + break; //only match one (names should be unique) + } } } return initInstance(new QActionAnimation(d->createAction())); |