From: Robert Knight Date: Tue, 24 Jul 2007 23:59:01 +0000 (+0000) Subject: Fix crash when category view is enabled if there are no categories in KCategorizedVie... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4661ece59442f49d08f9e0f64ac55d4e17faab00 Fix crash when category view is enabled if there are no categories in KCategorizedView::moveCursor() svn path=/trunk/KDE/kdebase/apps/; revision=692073 --- diff --git a/src/kcategorizedview.cpp b/src/kcategorizedview.cpp index b07774157..39d047724 100644 --- a/src/kcategorizedview.cpp +++ b/src/kcategorizedview.cpp @@ -1000,8 +1000,11 @@ void KCategorizedView::dragLeaveEvent(QDragLeaveEvent *event) QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) { - if ((viewMode() != KCategorizedView::IconMode) || !d->proxyModel || - !d->itemCategorizer) + if ( (viewMode() != KCategorizedView::IconMode) || + !d->proxyModel || + !d->itemCategorizer || + d->categories.isEmpty() + ) { return QListView::moveCursor(cursorAction, modifiers); } @@ -1023,9 +1026,10 @@ QModelIndex KCategorizedView::moveCursor(CursorAction cursorAction, int itemWidthPlusSeparation = spacing() + itemWidth; int elementsPerRow = viewportWidth / itemWidthPlusSeparation; - QString lastCategory = d->categories[0]; - QString theCategory = d->categories[0]; - QString afterCategory = d->categories[0]; + QString lastCategory = d->categories.first(); + QString theCategory = d->categories.first(); + QString afterCategory = d->categories.first(); + bool hasToBreak = false; foreach (const QString &category, d->categories) {