From 4616d291ca5d0e5e985a269db46a7447762c453a Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 24 Sep 2007 16:18:29 +0000 Subject: [PATCH] prevent an invalid active column index if columns have been deleted svn path=/trunk/KDE/kdebase/apps/; revision=716384 --- src/dolphincolumnview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index ee217b2bd..9fb3e35a8 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -536,6 +536,12 @@ void DolphinColumnView::showColumn(const KUrl& url) (*it)->deleteLater(); } m_columns.erase(start, end); + + const int maxIndex = m_columns.count() - 1; + Q_ASSERT(maxIndex >= 0); + if (m_index > maxIndex) { + m_index = maxIndex; + } break; } } -- 2.47.3