diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-08 00:13:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-08 01:52:16 +0100 |
| commit | b74bc6135a6a690bf5674638a8bea56e5580fd08 (patch) | |
| tree | 0686281f3b6dc067093a841e30fe2193038f695e /src/tools | |
| parent | 09d5906f44907aab5afb41ce2da887550c0011a8 (diff) | |
Show hints before make DCP (#823).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 6b1d4d260..f31464282 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -58,6 +58,7 @@ #include "lib/compose.hpp" #include "lib/cinema_kdms.h" #include "lib/dcpomatic_socket.h" +#include "lib/hints.h" #include <dcp/exceptions.h> #include <wx/generic/aboutdlgg.h> #include <wx/stdpaths.h> @@ -455,6 +456,15 @@ private: } } + if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + HintsDialog* hints = new HintsDialog (this, _film, false); + int const r = hints->ShowModal(); + hints->Destroy (); + if (r == wxID_CANCEL) { + return; + } + } + try { /* It seems to make sense to auto-save metadata here, since the make DCP may last a long time, and crashes/power failures are moderately likely. @@ -517,6 +527,15 @@ private: return; } + if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) { + HintsDialog* hints = new HintsDialog (this, _film, false); + int const r = hints->ShowModal(); + hints->Destroy (); + if (r == wxID_CANCEL) { + return; + } + } + _film->write_metadata (); /* i = 0; try to connect via socket @@ -663,7 +682,7 @@ private: void tools_hints () { if (!_hints_dialog) { - _hints_dialog = new HintsDialog (this, _film); + _hints_dialog = new HintsDialog (this, _film, true); } _hints_dialog->Show (); |
