From 517db36bab12518e8fdc3ef0a9bb1a22ec5d4035 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Tue, 14 Apr 2009 14:00:06 +0000
Subject: [PATCH] Merged revisions 953499 via svnmerge from
 svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepim

........
  r953499 | tmcguire | 2009-04-14 09:35:43 +0200 (Tue, 14 Apr 2009) | 7 lines

  Backport r949371 by tmcguire from trunk to the 4.2 branch:

  When adding a message fails, abort the mail check.
  This fixes a crash because the slave still sent in data, even though we didn't expect
  any pending messages anymore.
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=953745
---
 popaccount.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/popaccount.cpp b/popaccount.cpp
index 7cef82728..536133fea 100644
--- a/popaccount.cpp
+++ b/popaccount.cpp
@@ -322,7 +322,9 @@ void PopAccount::slotProcessPendingMsgs()
     const bool addedOk = processNewMsg( msg ); //added ok? Error displayed if not.
 
     if ( !addedOk ) {
+      kWarning() << "Error while processing new mail, aborting mail check.";
       mMsgsPendingDownload.clear();
+      slotAbortRequested();
       break;
     }