From 3a40aa397a5c1955d957b4396ef604686676e052 Mon Sep 17 00:00:00 2001 From: Montel Laurent <montel@kde.org> Date: Sun, 28 Jun 2015 08:13:57 +0200 Subject: [PATCH 01/74] Fix crash when we click on search button BUG: 349299 BUG: 349665 FIXED-IN: 4.10 --- mailcommon/search/searchpattern.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mailcommon/search/searchpattern.cpp b/mailcommon/search/searchpattern.cpp index 35cc528b62..28c997bc06 100644 --- a/mailcommon/search/searchpattern.cpp +++ b/mailcommon/search/searchpattern.cpp @@ -142,13 +142,14 @@ QString SearchPattern::purify(bool removeAction) #ifndef NDEBUG kDebug() << "Removing" << (*it)->asString(); #endif + if (!informationAboutNotValidPattern.isEmpty()) { + informationAboutNotValidPattern += QLatin1Char('\n'); + } + informationAboutNotValidPattern += (*it)->informationAboutNotValidRules(); + erase( it ); it = end(); } - if (!informationAboutNotValidPattern.isEmpty()) { - informationAboutNotValidPattern += QLatin1Char('\n'); - } - informationAboutNotValidPattern += (*it)->informationAboutNotValidRules(); } } -- 2.14.1