Minor fixes

4 files changed, 6 insertions, 6 deletions

diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index 6e6c3d4..bedf3c4 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -57,5 +57,5 @@ void AttachDiag::fileSelected(const DocLnk &file)
 
-DocLnk AttachDiag::getFile()
+DocLnk AttachDiag::getFile(QWidget *parent)
 {
-	AttachDiag *attach = new AttachDiag(0, 0, true);
+	AttachDiag *attach = new AttachDiag(parent, 0, true);
 	attach->showMaximized();
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h
index c673cfc..bce5b4b 100644
--- a/noncore/unsupported/mail2/attachdiag.h
+++ b/noncore/unsupported/mail2/attachdiag.h
@@ -12,3 +12,3 @@ class AttachDiag : public QDialog
 public:
-	static DocLnk getFile();
+	static DocLnk getFile(QWidget *parent);
 
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 57f0779..82ed117 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -201,3 +201,3 @@ void Composer::slotAddAttach()
 {
-	DocLnk lnk = AttachDiag::getFile();
+	DocLnk lnk = AttachDiag::getFile(this);
 	if (lnk.name().isEmpty()) return;
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
@@ -103,5 +103,5 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
 				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;
 				}