Assure that the keyboard focus stays inside the view when replacing the view implementation, otherwise when having a split view the other view gets the focus and will activate itself.

BUG: 164468

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

1 files changed, 6 insertions, 0 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 7ffcbced5..0b04d0afa 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1143,6 +1143,12 @@ void DolphinView::deleteView()
 {
     QAbstractItemView* view = itemView();
     if (view != 0) {
+        // It's important to set the keyboard focus to the parent
+        // before deleting the view: Otherwise when having a split
+        // view the other view will get the focus and will request
+        // an activation (see DolphinView::eventFilter()).
+        setFocus();
+
         m_topLayout->removeWidget(view);
         view->close();
         view->deleteLater();