diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-20 00:21:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-20 00:21:54 +0100 |
| commit | 9518d2a417833b530d2ef00c33179b27bcfa41da (patch) | |
| tree | efaf7124d49ce6d1bda6bf00e49b46a7fd8e14d3 | |
| parent | 466524e5991cb51dd9c961eac4cb9c0d051938d4 (diff) | |
| parent | c0f3447986fd336570028b5601497d752989225c (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rwxr-xr-x | run/dcpomatic | 2 | ||||
| -rw-r--r-- | src/lib/reel_writer.cc | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/run/dcpomatic b/run/dcpomatic index eaba93886..0bd54f66b 100755 --- 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 d742818ae..6432c294b 100644 --- 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 { |