fixed wrong ASSERT in column-view (the usecase is valid)

BUG: 158615

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 09dfccc82544e49791c094ff6c2cd73ee20e566c..bf1c882a476fbdcf7f567749aaa47f9d714aaee2 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -391,13 +391,13 @@ void DolphinColumnWidget::slotEntered(const QModelIndex& index)
 
 void DolphinColumnWidget::requestActivation()
 {
 
 void DolphinColumnWidget::requestActivation()
 {

+    m_view->m_controller->setItemView(this);

     m_view->m_controller->requestActivation();
     if (!m_active) {
         m_view->requestActivation(this);
         m_view->m_controller->triggerUrlChangeRequest(m_url);
         selectionModel()->clear();
     }
     m_view->m_controller->requestActivation();
     if (!m_active) {
         m_view->requestActivation(this);
         m_view->m_controller->triggerUrlChangeRequest(m_url);
         selectionModel()->clear();
     }

-    Q_ASSERT(m_view->m_controller->itemView() == this);

 }
 
 void DolphinColumnWidget::updateFont()
 }
 
 void DolphinColumnWidget::updateFont()