Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/run/dcpomatic b/run/dcpomatic
index eaba93886eb332bdc423a3dc6ec61484c6d220b9..0bd54f66b0cade2025582cec56b0acf94d25eab8 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -7,7 +7,7 @@ if [ "$1" == "--debug" ]; then
     gdb --args build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" --suppressions=suppressions build/src/tools/dcpomatic2 $*
+    valgrind --tool="memcheck" --suppressions=suppressions --track-fds=yes build/src/tools/dcpomatic2 $*
 elif [ "$1" == "--callgrind" ]; then
     shift
     valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index d742818ae08849bfe81e191c3f922deb01a3b6c0..6432c294bbee29746280a953fd5bce5052bb9dfe 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -130,7 +130,16 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 {
        FILE* file = 0;
        boost::filesystem::path info_file = _film->info_file (_period);
+
        bool const read = boost::filesystem::exists (info_file);
+
+#ifdef DCPOMATIC_WINDOWS
+       LOG_GENERAL (
+               "Checked %1 (exists %2) length is %3 perms are %4",
+               info_file, read ? 1 : 0, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions())
+               );
+#endif
+
        if (read) {
                file = fopen_boost (info_file, "r+b");
        } else {