Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp

1 files changed, 6 insertions, 3 deletions

diff --git a/src/evidence.cpp b/src/evidence.cpp
index a8f59135..b97607ba 100644
--- a/src/evidence.cpp
+++ b/src/evidence.cpp
@@ -258,8 +258,9 @@ void Courtroom::set_evidence_list(QVector<evi_type> &p_evi_list)
     else if (compare_evidence_changed(
                  old_list.at(current_evidence),
                  local_evidence_list.at(current_evidence))) {
-      QMessageBox *msgBox = new QMessageBox;
+      QMessageBox *msgBox = new QMessageBox(this);
 
+      msgBox->setAttribute(Qt::WA_DeleteOnClose);
       msgBox->setText(tr("The piece of evidence you've been editing has changed."));
       msgBox->setInformativeText(tr("Do you wish to keep your changes?"));
       msgBox->setDetailedText(tr(
@@ -552,7 +553,8 @@ void Courtroom::on_evidence_x_clicked()
     evidence_close();
     return;
   }
-  QMessageBox *msgBox = new QMessageBox;
+  QMessageBox *msgBox = new QMessageBox(this);
+  msgBox->setAttribute(Qt::WA_DeleteOnClose);
   msgBox->setText(tr("Evidence has been modified."));
   msgBox->setInformativeText(tr("Do you want to save your changes?"));
   msgBox->setStandardButtons(QMessageBox::Save | QMessageBox::Discard |
@@ -655,7 +657,8 @@ void Courtroom::on_evidence_transfer_clicked()
     private_evidence_list.append(f_evi);
   }
 
-  QMessageBox *msgBox = new QMessageBox;
+  QMessageBox *msgBox = new QMessageBox(this);
+  msgBox->setAttribute(Qt::WA_DeleteOnClose);
   msgBox->setText(tr("\"%1\" has been transferred.").arg(name));
   msgBox->setStandardButtons(QMessageBox::Ok);
   msgBox->setDefaultButton(QMessageBox::Ok);