Fix crash. Steps to reproduce:

* Open Dolphin. Enable categorization.
* Split the view. Disable categorization on the right one.
* Join the views.

I am not sure if this is the best way to proceed for this small bug. Please Peter, take a look.

CCMAIL: peter.penz@gmx.at

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bfde4da66c922872c3c3f4c888261e9afc3da08f..98a91327f39f1edf7ac0b5a2265f1239aff4cf3f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1041,7 +1041,7 @@ void DolphinMainWindow::init()
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 {
     Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 {
     Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));

-    if (m_activeViewContainer == view) {
+    if (m_activeViewContainer == view || !view) {

         return;
     }
 
         return;
     }