Minor fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 427e72c..6602919 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -80,51 +80,51 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
 		QValueList<Attachment> attachments = _smail.attachments();
 		QValueList<Attachment>::Iterator it;
 		for (it = attachments.begin(); it != attachments.end(); it++) {
 			QFile f((*it).fileName());
 			if (f.open(IO_ReadOnly)) {
 				QTextStream t(&f);
 				QString file;
 				while (!t.atEnd()) file += t.readLine() + "\n";
 				f.close();
 				QString mimetype = (new MimeType(*(*it).docLnk()))->id(); 
 
 				_body += "\n--" + boundary + "\n";
 				_body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n";
 
 				// TODO: Decide which content transfer encoding is best. B64 for binary, QP for text.
 				_body += "Content-Transfer-Encoding: base64\n";
 
 				_body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n";
 				if (!(*it).description().isEmpty()) 
 					_body += "Content-Description: " + (*it).description() + "\n";
 
 				_body += "\n" + MiscFunctions::encodeBase64(file) + "\n";
 			} else {
 				int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort"));
-				if (ret == 1) {
-					it = attachments.end();
+				if (ret != 0) {
 					_abort = true;
+					break;
 				}
 			}
 		}
 		_body += "\n--" + boundary + "--";
 	}
 
 	if (_abort) {
 		_body = QString(0);
 		_header = QString(0);
 	}
 }
 
 // Unfinished GPG code.
 /*
 void MailFactory::openPgpEncrypt(const QString &text, QString &header, QString &body)
 {
 	QString boundary = MiscFunctions::uniqueString();
 
 	header += "Content-Type: multipart/encrypted; boundary=\"" + boundary + "\"; protocol=\"application/pgp-encrypted\"\n";
 
 	body += "--" + boundary + "\n";
 	body += "Content-Type: application/pgp-encrypted\n\n";
 	body += "Version: 1\n\n";
 	body += "--" + boundary + "\n";