Hand-apply 96593d0ea6eb7b01ee97c8292c4546fc56d3da9d; only write metadata before encode in the main front-end, not the cli/batch processors.

2 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index cc75a0558..af58dcefb 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -269,11 +269,6 @@ Film::make_dcp ()
 		throw BadSettingError (_("name"), _("cannot contain slashes"));
 	}
 
-	/* 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.
-	 */
-	write_metadata ();
-
 	LOG_GENERAL ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary());
 
 	{
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ae0c25591..26dce9984 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -400,6 +400,10 @@ private:
 		}
 
 		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.
+			*/
+			_film->write_metadata ();
 			_film->make_dcp ();
 		} catch (BadSettingError& e) {
 			error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));