Don't crash if the currentIndex is set while creating a delegate.

Task-number: QTBUG-8456

1 files changed, 3 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index aae5571..2ef6305 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -321,7 +321,7 @@ FxGridItem *QDeclarativeGridViewPrivate::createItem(int modelIndex)
         listItem->item->setParent(q->viewport());
         unrequestedItems.remove(listItem->item);
     }
-    requestedIndex = 0;
+    requestedIndex = -1;
     return listItem;
 }
 
@@ -888,6 +888,8 @@ int QDeclarativeGridView::currentIndex() const
 void QDeclarativeGridView::setCurrentIndex(int index)
 {
     Q_D(QDeclarativeGridView);
+    if (d->requestedIndex >= 0) // currently creating item
+        return;
     if (isComponentComplete() && d->isValid() && index != d->currentIndex && index < d->model->count() && index >= 0) {
         d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
         cancelFlick();