fixed abort bug

1 files changed, 1 insertions, 0 deletions

diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 03d50b6..57f0779 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -99,48 +99,49 @@ void Composer::slotSendMail()
 	smail.setBcc(bcc->text());
 	smail.setSubject(subject->text());
 	smail.setMessage(message->text());
 	smail.setNeedsMime(attachView->childCount() == 0 ? false : true);
 	smail.setAccount(accountsLoaded[from->currentItem()]);
 
 	if (priority->currentItem() == POPUP_PRIO_LOW) {
 		smail.setPriority("Low");	// No i18n on purpose
 	} else if (priority->currentItem() == POPUP_PRIO_NORMAL) {
 		smail.setPriority("Normal");	// No i18n on purpose
 	} else if (priority->currentItem() == POPUP_PRIO_HIGH) {
 		smail.setPriority("High");	// No i18n on purpose
 	}
 
 	QValueList<Attachment> attachments;
 	QListViewItem *item;
 	for (item = attachView->firstChild(); item != 0; item = item->itemBelow()) {
 		attachments.append(((AttachViewItem *)item)->attachment());
 	}
 
 	smail.setAttachments(attachments);
 
 	QString header, message;
 	MailFactory::genMail(header, message, smail, this);
+	if (header.isNull() || message.isNull()) return;	// Aborted.
 
 	abort->setEnabled(true);
 
 	SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text());
 	connect(handler, SIGNAL(finished()), SLOT(slotSendFinished()));
 	connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &)));
 	connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &)));
 }
 
 void Composer::slotSendError(const QString &error)
 {
 	status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
 	QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok"));
 }
 
 void Composer::slotSendFinished()
 {
 	QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok"));
 
 	status->setText(QString(0));
 	abort->setEnabled(false);
 }
 
 void Composer::slotFillStuff()