From ab676813996ec81f9d3b4ae8996b2bb3bf0d1402 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Sun, 20 Jul 2008 12:49:16 +0000 Subject: [PATCH] Don't crash when checking mail and the POP filter dialog is not shown because all POP filters already match. BUG: 167008 svn path=/trunk/KDE/kdepim/; revision=835319 --- popaccount.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/popaccount.cpp b/popaccount.cpp index 43ca074f1..7cef82728 100644 --- a/popaccount.cpp +++ b/popaccount.cpp @@ -616,7 +616,11 @@ void PopAccount::slotJobFinished() { mPopFilterConfirmationDialog->exec(); } - if ( mPopFilterConfirmationDialog->result() == QDialog::Accepted ) { + // If the dialog was accepted or never shown (because all pop filters already + // set the actions), mark the messages for deletion, download or for keeping + // them. Then advance to the next stage, the download stage. + if ( !dlgPopup || + mPopFilterConfirmationDialog->result() == QDialog::Accepted ) { for ( int i = 0; i < mHeadersOnServer.count(); ++i ) { const KMPopHeaders *header = mHeadersOnServer[i];