prevent an invalid active column index if columns have been deleted

svn path=/trunk/KDE/kdebase/apps/; revision=716384

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index ee217b2bd3177faa012fcb4ac3a9e8e8a72ef895..9fb3e35a81a9bc9987a5f450a77f8faca79ce255 100644 (file)
--- 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);
                     (*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;
             }
         }
                 break;
             }
         }