X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=8bcca9b22b721d20d21b1a0f8fec461f5bc20e0e;hb=c8966336f48c4de7222a97c23eccad24fab45121;hp=2cc3187d6366d4f73fac2e7175f0f484b29a976a;hpb=44b69f2d9affb048c3d166e3a62bf3462dd5c8b5;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 2cc3187d6..8bcca9b22 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -451,12 +451,12 @@ public:
 		}
 
 		for (auto i: notes) {
-			error_dialog (0, std_to_wx(i));
+			error_dialog (nullptr, std_to_wx(i));
 		}
 
 		set_film (film);
 
-		JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
+		JobManager::instance()->add(make_shared<CheckContentChangeJob>(film));
 	}
 	catch (FileNotFoundError& e) {
 		auto const dir = e.file().parent_path();
@@ -798,7 +798,7 @@ private:
 			   a long time, and crashes/power failures are moderately likely.
 			*/
 			_film->write_metadata ();
-			_film->make_dcp (true);
+			_film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		} catch (BadSettingError& e) {
 			error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
 		} catch (std::exception& e) {
@@ -992,7 +992,7 @@ private:
 				}
 			}
 
-			auto job = make_shared<TranscodeJob>(_film);
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 			job->set_encoder (
 				make_shared<FFmpegEncoder> (
 					_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
@@ -1007,7 +1007,7 @@ private:
 	{
 		auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop());
 		if (d->ShowModal() == wxID_OK) {
-			auto job = make_shared<TranscodeJob>(_film);
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 			job->set_encoder (
 				make_shared<SubtitleEncoder>(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font())
 				);