Slight hack to reduce the chance of config files looking different

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index eda45afff4a166b462be689e978613d6182b41c8..23b06f2e40a7ac9fdeea84eccd05344473c76b64 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -665,7 +665,7 @@ Config::write_config () const
        root->add_child("DefaultDCPAudioChannels")->add_child_text (raw_convert<string> (_default_dcp_audio_channels));
        /* [XML] DCPIssuer Issuer text to write into CPL files. */
        root->add_child("DCPIssuer")->add_child_text (_dcp_issuer);
-       /* [XML] DCPIssuer Creator text to write into CPL files. */
+       /* [XML] DCPCreator Creator text to write into CPL files. */
        root->add_child("DCPCreator")->add_child_text (_dcp_creator);
        /* [XML] Company name to write into MXF files. */
        root->add_child("DCPCompanyName")->add_child_text (_dcp_company_name);
@@ -774,8 +774,13 @@ Config::write_config () const
        /* [XML] AutomaticAudioAnalysis 1 to run audio analysis automatically when audio content is added to the film, otherwise 0. */
        root->add_child("AutomaticAudioAnalysis")->add_child_text (_automatic_audio_analysis ? "1" : "0");
 #ifdef DCPOMATIC_WINDOWS
-       /* [XML] Win32Console 1 to open a console when running on Windows, otherwise 0. */
-       root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
+       if (_win32_console) {
+               /* [XML] Win32Console 1 to open a console when running on Windows, otherwise 0.
+                * We only write this if it's true, which is a bit of a hack to allow unit tests to work
+                * more easily on Windows (without a platform-specific reference in config_write_utf8_test)
+                */
+               root->add_child("Win32Console")->add_child_text ("1");
+       }
 #endif
 
        /* [XML] Signer Certificate chain and private key to use when signing DCPs and KDMs.  Should contain <code>&lt;Certificate&gt;</code>
@@ -984,7 +989,7 @@ Config::write_config () const
                if (!f) {
                        throw FileError (_("Could not open file for writing"), tmp);
                }
-               checked_fwrite (s.c_str(), s.length(), f, tmp);
+               checked_fwrite (s.c_str(), s.bytes(), f, tmp);
                fclose (f);
                boost::filesystem::remove (config_file());
                boost::filesystem::rename (tmp, config_file());