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

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 064c3f0ec08db18da764b54a1b218c8f6759c598..5e8f8fc9fd1935476a1a8f7238b3b4b14acf5be8 100644 (file)
--- 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
index 789bd241695300320126152037ae171ec6581466..83a0643c345454864dafabfb9d4703db30dd0bc0 160000 (submodule)
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 789bd241695300320126152037ae171ec6581466
+Subproject commit 83a0643c345454864dafabfb9d4703db30dd0bc0