From: Rafael Fernández López <ereslibre@kde.org>
Date: Tue, 26 Jun 2007 11:50:54 +0000 (+0000)
Subject: Fix crash. Steps to reproduce:
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/14a666ce8d7cc980b2d14a4499c250dc15c1a998?ds=inline

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 bfde4da66..98a91327f 100644
--- 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]));
-    if (m_activeViewContainer == view) {
+    if (m_activeViewContainer == view || !view) {
         return;
     }