Wait for threads in iterator destructor

src/ifcgeom/Iterator.h

@@ -102,6 +102,7 @@ namespace IfcGeom {
 		GeometrySerializer* cache_ = nullptr;
 
 		std::atomic<bool> finished_{ false };
+		std::atomic<bool> terminating_{ false };
 		std::atomic<int> progress_{ 0 };
 
 		std::vector<geometry_conversion_result> tasks_;
@@ -316,6 +317,10 @@ namespace IfcGeom {
 					std::ref(settings_),
 					&rep);
 
+				if (terminating_) {
+					break;
+				}
+
 				threadpool.emplace_back(std::move(fu));
 			}
 
@@ -327,9 +332,11 @@ namespace IfcGeom {
 
 			Logger::SetProduct(boost::none);
 
+			if (!terminating_) {
 				Logger::Status("\rDone creating geometry (" + boost::lexical_cast<std::string>(all_processed_elements_.size()) +
 					" objects)								");
 			}
+		}
 
 		/// Computes model's bounding box (bounds_min and bounds_max).
 		/// @note Can take several minutes for large files.
@@ -773,6 +780,14 @@ namespace IfcGeom {
 		}
 
 		~Iterator() {
+			if (num_threads_ != 1) {
+				terminating_ = true;
+
+				if (init_future_.valid()) {
+					init_future_.wait();
+				}
+			}
+
 			if (owns_ifc_file) {
 				delete ifc_file;
 			}