PbiStream: check if only a single file is given

inphos42 · Mar 23, 2018 · ec2c2a8 · ec2c2a8
1 parent 5605b2a
commit ec2c2a8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/osmpbf/pbistream.cpp b/osmpbf/pbistream.cpp
@@ -210,10 +210,14 @@ m_priv(std::make_unique<imp::SingleFilePbiStream>(std::move(fileIn)))
 {}
 
 PbiStream::PbiStream(std::vector<OSMFileIn> && files) {
- if (files.size()) {
+ if (files.size() > 1) {
  m_priv = std::make_unique<imp::MultiFilePbiStream>(files.begin(), files.end());
- files.clear();
+
+ }
+ else if (files.size()) {
+ m_priv = std::make_unique<imp::SingleFilePbiStream>(std::move(files.front()));
  }
+ files.clear();
 }
 
 PbiStream::PbiStream(const std::vector<std::string> & fileNames) {
@@ -229,7 +233,7 @@ PbiStream::PbiStream(const std::vector<std::string> & fileNames) {
  }
  }
  if (files.size() == 1) {
- m_priv.reset(new imp::SingleFilePbiStream(std::move(files[0])));
+ m_priv.reset(new imp::SingleFilePbiStream(std::move(files.front())));
  }
  else if (files.size() > 1) {
  m_priv.reset(new imp::MultiFilePbiStream(files.begin(), files.end()));