Tell user what just happened if they get either of the disk writer confirmations...

[dcpomatic.git] / src / tools / dcpomatic_disk.cc

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index e2cd108c17a4654d6942245aed1d723f66662d4c..d3235c1bbc1d7c2ad7db1e189b574f6083d816bc 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -367,12 +367,12 @@ private:
                }
 
 
-               auto * d = new DriveWipeWarningDialog (this, _drive->GetString(_drive->GetSelection()));
-               int const r = d->ShowModal ();
-               bool ok = r == wxID_OK && d->confirmed();
-               d->Destroy ();
-
-               if (!ok) {
+               auto d = make_wx<DriveWipeWarningDialog>(this, _drive->GetString(_drive->GetSelection()));
+               if (d->ShowModal() != wxID_OK) {
+                       return;
+               }
+               if (!d->confirmed()) {
+                       message_dialog(this, _("You did not correctly confirm that you read the warning that was just shown.  Please try again."));
                        return;
                }
 
@@ -478,12 +478,14 @@ public:
                        Config::drop ();
 
                        if (!_skip_alpha_check) {
-                               auto warning = new DiskWarningDialog ();
-                               warning->ShowModal ();
+                               auto warning = make_wx<DiskWarningDialog>();
+                               if (warning->ShowModal() != wxID_OK) {
+                                       return false;
+                               }
                                if (!warning->confirmed()) {
+                                       message_dialog(nullptr, _("You did not correctly confirm that you read the warning that was just shown.  DCP-o-matic Disk Writer will close now.  Please try again."));
                                        return false;
                                }
-                               warning->Destroy ();
                        }
 
                        _frame = new DOMFrame (_("DCP-o-matic Disk Writer"));