From 4615d8968de65884088d48a86b56e26656c1d526 Mon Sep 17 00:00:00 2001
From: Ismail Onur Filiz <onurf@su.sabanciuniv.edu>
Date: Sun, 23 Apr 2006 11:02:28 +0000
Subject: [PATCH] Better way of checking for 'null'ity of fti, related to the
 bugfix in commit 530074.

svn path=/branches/KDE/3.5/kdepim/; revision=532935
---
 kmfoldertree.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp
index 2e7ead04e..78be0f18a 100644
--- a/kmfoldertree.cpp
+++ b/kmfoldertree.cpp
@@ -1472,13 +1472,12 @@ void KMFolderTree::slotRenameFolder(QListViewItem *item, int col,
 
   KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>(item);
 
-  if (fti && fti->folder() && col != 0 && !currentFolder()->child())
+  if ((!fti) || (fti && fti->folder() && col != 0 && !currentFolder()->child()))
           return;
 
   QString fldName, oldFldName;
 
-  if ( fti )
-    oldFldName = fti->name(0);
+  oldFldName = fti->name(0);
 
   if (!text.isEmpty())
           fldName = text;