From cde8080ae80142635350217d7051db244b96cb4e Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 3 Dec 2014 13:18:39 +0100 Subject: [PATCH] Don't show error message when we cancel crypto. Fix potential crash when model is null if we forgot to set it --- editor/kmcomposewin.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/editor/kmcomposewin.cpp b/editor/kmcomposewin.cpp index d844e2928..9dbe8540d 100644 --- a/editor/kmcomposewin.cpp +++ b/editor/kmcomposewin.cpp @@ -1971,8 +1971,10 @@ void KMComposeWin::slotSendFailed( const QString& msg,MessageComposer::ComposerV { // setModified( false ); setEnabled( true ); - KMessageBox::sorry( mMainWidget, msg, - (type == MessageComposer::ComposerViewBase::AutoSave) ? i18n( "Autosave Message Failed" ) : i18n( "Sending Message Failed" ) ); + if (!msg.isEmpty()) { + KMessageBox::sorry( mMainWidget, msg, + (type == MessageComposer::ComposerViewBase::AutoSave) ? i18n( "Autosave Message Failed" ) : i18n( "Sending Message Failed" ) ); + } } void KMComposeWin::slotSendSuccessful(const QString &messageId)