From dc10145485dc94decd3200070ab16b905aca564d Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Sun, 31 Aug 2008 12:12:25 +0000
Subject: [PATCH] Manually port SVN commit 852838 by tmcguire from trunk. Note
 to self: Block in e4->trunk

Don't crash when there is no search folder yet.

svn path=/branches/kdepim/enterprise4/kdepim/; revision=855292
---
 searchwindow.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/searchwindow.cpp b/searchwindow.cpp
index 40db906b5..068ab41c4 100644
--- a/searchwindow.cpp
+++ b/searchwindow.cpp
@@ -656,14 +656,16 @@ void SearchWindow::renameSearchFolder()
       ++i;
     }
   }
-  mSearchFolderOpenBtn->setEnabled(true);
+  if ( mFolder )
+    mSearchFolderOpenBtn->setEnabled( true );
 }
 
 void SearchWindow::openSearchFolder()
 {
-    renameSearchFolder();
-    mKMMainWidget->slotSelectFolder( mFolder->folder() );
-    slotClose();
+  Q_ASSERT( mFolder );
+  renameSearchFolder();
+  mKMMainWidget->slotSelectFolder( mFolder->folder() );
+  slotClose();
 }
 
 //-----------------------------------------------------------------------------