From 5ae10e2c7eb7192169c40c4bd05a36917ac30450 Mon Sep 17 00:00:00 2001 From: Pradeepto Bhattacharya Date: Fri, 25 May 2007 03:30:03 +0000 Subject: [PATCH] Merge ... SVN commit 645830 by wstephens: Don't crash if we can't find the folder. BUG#121863 svn path=/branches/kdepim/enterprise/kdepim/; revision=668092 --- kmfilteraction.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kmfilteraction.cpp b/kmfilteraction.cpp index ff014d631..c31245f8b 100644 --- a/kmfilteraction.cpp +++ b/kmfilteraction.cpp @@ -1378,7 +1378,9 @@ KMFilterAction::ReturnCode KMFilterActionCopy::process(KMMessage* msg) const // TODO opening and closing the folder is a trade off. // Perhaps Copy is a seldomly used action for now, // but I gonna look at improvements ASAP. - if ( !mFolder && mFolder->open() != 0 ) + if ( !mFolder ) + return ErrorButGoOn; + if ( mFolder && mFolder->open() != 0 ) return ErrorButGoOn; // copy the message 1:1