Fix some missing set-to-defaults (#640).

diff --git a/ChangeLog b/ChangeLog
index 80fb8836cb78ff3454ee40641c4ecb79eb020775..aedac048ff6493c49a5981a95053ecff023b5b05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-07-19  Carl Hetherington  <cth@carlh.net>
 
+       * Fix some missing set-to-defaults (#640).
+
        * Version 2.1.25 released.
 
 2015-07-17  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 6eecc8574b9561e8d3649ea72aad94492bb5edb3..e600056ad1f9ed800d7a4569cdd3d098aa60a9f3 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -68,16 +68,28 @@ Config::set_defaults ()
        _num_local_encoding_threads = max (2U, boost::thread::hardware_concurrency ());
        _server_port_base = 6192;
        _use_any_servers = true;
+       _servers.clear ();
        _tms_protocol = PROTOCOL_SCP;
+       _tms_ip = "";
        _tms_path = ".";
+       _tms_user = "";
+       _tms_password = "";
        _cinema_sound_processor = CinemaSoundProcessor::from_id (N_("dolby_cp750"));
        _allow_any_dcp_frame_rate = false;
+       _language = optional<string> ();
        _default_still_length = 10;
        _default_container = Ratio::from_id ("185");
        _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
        _default_j2k_bandwidth = 100000000;
        _default_audio_delay = 0;
+       _mail_server = "";
        _mail_port = 25;
+       _mail_user = "";
+       _mail_password = "";
+       _kdm_subject = _("KDM delivery");
+       _kdm_from = "";
+       _kdm_cc = "";
+       _kdm_bcc = "";
        _check_for_updates = false;
        _check_for_test_updates = false;
        _maximum_j2k_bandwidth = 250000000;