diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-06-18 00:49:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-06-18 00:49:33 +0100 |
| commit | f3d195de9fbd795f44a82c274c01891eec77a1d4 (patch) | |
| tree | 64459accad8466f02a5b2dafa406e7c54a737152 | |
| parent | 66c25e7a73fdc417d01d68b32a5e9eea8fca25dc (diff) | |
| parent | e60e8613908c666d7e829c2fd69fc2191d0bc2fd (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | src/lib/writer.cc | 4 | ||||
| m--------- | test/data | 0 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 064c3f0ec..5e8f8fc9f 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -563,7 +563,9 @@ Writer::write_cover_sheet () boost::filesystem::recursive_directory_iterator i = boost::filesystem::recursive_directory_iterator(_film->dir(_film->dcp_name())); i != boost::filesystem::recursive_directory_iterator(); ++i) { - size += boost::filesystem::file_size (i->path ()); + if (boost::filesystem::is_regular_file (i->path ())) { + size += boost::filesystem::file_size (i->path ()); + } } if (size > (1000000000L)) { diff --git a/test/data b/test/data -Subproject 789bd241695300320126152037ae171ec658146 +Subproject 83a0643c345454864dafabfb9d4703db30dd0bc |