fix crash when opening a lot of columns and going back very fast by clicking on each...

BUG: 164304

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

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 957b2064f64bd6774c1875ad816dbee01e43ac55..6d4801aeaa372c1baeba15e4008fe8026c7b59d6 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -190,7 +190,7 @@ void DolphinColumnView::showColumn(const KUrl& url)
                 QList<DolphinColumnWidget*>::iterator start = m_columns.begin() + columnIndex;
                 QList<DolphinColumnWidget*>::iterator end = m_columns.end();
                 for (QList<DolphinColumnWidget*>::iterator it = start; it != end; ++it) {
-                    (*it)->deleteLater();
+                    deleteColumn(*it);
                 }
                 m_columns.erase(start, end);
 
@@ -594,7 +594,7 @@ void DolphinColumnView::removeAllColumns()
     QList<DolphinColumnWidget*>::iterator start = m_columns.begin() + 1;
     QList<DolphinColumnWidget*>::iterator end = m_columns.end();
     for (QList<DolphinColumnWidget*>::iterator it = start; it != end; ++it) {
-        (*it)->deleteLater();
+        deleteColumn(*it);
     }
     m_columns.erase(start, end);
     m_index = 0;
@@ -608,4 +608,15 @@ QPoint DolphinColumnView::columnPosition(DolphinColumnWidget* column, const QPoi
     return QPoint(point.x() - topLeft.x(), point.y() - topLeft.y());
 }
 
+void DolphinColumnView::deleteColumn(DolphinColumnWidget* column)
+{
+    if (column != 0) {
+        if (m_controller->itemView() == column) {
+            m_controller->setItemView(0);
+        }
+        column->disconnect();
+        column->deleteLater();
+    }   
+}
+
 #include "dolphincolumnview.moc"

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index 62569a0824c715a75fd97012dd1509f67fb560a7..24353ad34e7ef1cf31305c36495c89d307141049 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -197,6 +197,12 @@ private:
      */
     QPoint columnPosition(DolphinColumnWidget* column, const QPoint& point) const;
 
+    /**
+     * Deletes the column. If the itemview of the controller is set to the column,
+     * the controllers itemview is set to 0.
+     */
+    void deleteColumn(DolphinColumnWidget* column);
+
 private:
     DolphinController* m_controller;
     bool m_active;

diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp
index b00ca71605dc10a4224b461dc6b06bb652233c47..375eb44035736f06e5394be24098efc5a9b3ba0b 100644 (file)
--- a/src/dolphincontroller.cpp
+++ b/src/dolphincontroller.cpp
@@ -57,9 +57,11 @@ void DolphinController::setItemView(QAbstractItemView* view)
 
     m_itemView = view;
 
-    // TODO: this is a workaround until  Qt-issue 176832 has been fixed
-    connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
-            this, SLOT(updateOpenTabState()));
+    if (m_itemView != 0) {
+        // TODO: this is a workaround until  Qt-issue 176832 has been fixed
+        connect(m_itemView, SIGNAL(pressed(const QModelIndex&)),
+                this, SLOT(updateOpenTabState()));
+    }
 }
 
 void DolphinController::triggerUrlChangeRequest(const KUrl& url)