From 9b25a6f39ee59fe1bb4352a5f2e4ef4a91f1f2c3 Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Tue, 19 Mar 2013 14:01:54 +0100
Subject: QQuickItemView: Add guard before returning currentItem item

And don't check if the currentItem is empty before calling
applyPendingChanges().

And an autotest. (Patch from Steffen Imhof)

Task-number: QTBUG-30227

Change-Id: Ia16362a6d0dce771f20772929c32e9306ed0e0f9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
---
 src/quick/items/qquickitemview.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/quick/items/qquickitemview.cpp')

diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index b73fb8c5b6..be056d13fd 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -248,10 +248,8 @@ QQuickItemView::~QQuickItemView()
 QQuickItem *QQuickItemView::currentItem() const
 {
     Q_D(const QQuickItemView);
-    if (!d->currentItem)
-        return 0;
     const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
-    return d->currentItem->item;
+    return d->currentItem ? d->currentItem->item : 0;
 }
 
 QVariant QQuickItemView::model() const
-- 
cgit v1.2.3