Use plain git hash for VERSION when there is no exact tag.

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

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 58aa1b01badeb91e0cf964d3585ab6d5ea0eec6a..1c2f2c6354fcf3ef4f2edf73096c9add9af39c22 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -316,7 +316,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        }
 
        if (_name.empty()) {
-               _name = content[0].path.leaf().string();
+               _name = content[0].path.filename().string();
        }
 
        if (_j2k_bandwidth && (*_j2k_bandwidth < 10000000 || *_j2k_bandwidth > Config::instance()->maximum_j2k_bandwidth())) {
@@ -381,7 +381,7 @@ CreateCLI::make_film() const
                        channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
                }
        }
-       if (channels % 1) {
+       if (channels % 2) {
                ++channels;
        }