summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-05 02:09:25 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2010-08-06 03:32:35 (GMT)
commit828604016ae257281c2e6ee2e4693e6833b478e3 (patch)
treec96b4512d42b5f1f0cffc9dcdfd343af78849a51
parent3321df1a1483dce881530b614e17c1878f42d957 (diff)
downloadQt-828604016ae257281c2e6ee2e4693e6833b478e3.zip
Qt-828604016ae257281c2e6ee2e4693e6833b478e3.tar.gz
Qt-828604016ae257281c2e6ee2e4693e6833b478e3.tar.bz2
Fix crash when all visible items inluding currentIndex have been removed.
Task-number: QTBUG-11251 Reviewed-by: Bea Lam (cherry picked from commit 7de5f19f0f62f181132394da6d7b2c8484cd42d9)
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 82b3e1c..e1dd1c0 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1021,7 +1021,7 @@ void QDeclarativeListViewPrivate::updateCurrent(int modelIndex)
if (oldCurrentItem && (!currentItem || oldCurrentItem->item != currentItem->item))
oldCurrentItem->attached->setIsCurrentItem(false);
if (currentItem) {
- if (modelIndex == visibleIndex - 1) {
+ if (modelIndex == visibleIndex - 1 && visibleItems.count()) {
// We can calculate exact postion in this case
currentItem->setPosition(visibleItems.first()->position() - currentItem->size() - spacing);
} else {