From: Carl Hetherington <cth@carlh.net>
Date: Tue, 13 Feb 2018 01:08:14 +0000 (+0000)
Subject: Make Config::read() fallback match Config::set_defaults() for
X-Git-Tag: v2.11.56~6
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=08feee25150ff15bad67087c80e44ba21e6ebd0d

Make Config::read() fallback match Config::set_defaults() for
_default_dcp_content_type.
---

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 16df3779f..503ca9c5f 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -253,11 +253,7 @@ try
 		_default_scale_to = Ratio::from_id (c.get ());
 	}
 
-	c = f.optional_string_child ("DefaultDCPContentType");
-	if (c) {
-		_default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ());
-	}
-
+	_default_dcp_content_type = DCPContentType::from_isdcf_name(f.optional_string_child("DefaultDCPContentType").get_value_or("FTR"));
 	_default_dcp_audio_channels = f.optional_number_child<int>("DefaultDCPAudioChannels").get_value_or (6);
 
 	if (f.optional_string_child ("DCPMetadataIssuer")) {