Setup MXF keys after re-load before generating KDM; allow numbers in KDM names.

2 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 069be9b98..d218524f4 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -961,6 +961,8 @@ Film::make_kdms (
 		time_t now = time (0);
 		struct tm* tm = localtime (&now);
 		string const issue_date = libdcp::tm_to_string (tm);
+
+		dcp.cpls().front()->set_mxf_keys (key ());
 		
 		libdcp::KDM kdm (
 			dcp.cpls().front(), signer, (*i)->certificate, from, until, "DCP-o-matic", issue_date
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 667ee8ce9..baa37ae7c 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -807,7 +807,7 @@ tidy_for_filename (string f)
 {
 	string t;
 	for (size_t i = 0; i < f.length(); ++i) {
-		if (isalpha (f[i]) || f[i] == '_' || f[i] == '-') {
+		if (isalnum (f[i]) || f[i] == '_' || f[i] == '-') {
 			t += f[i];
 		} else {
 			t += '_';