Make sure we wait for all scheduled tasks to complete before throwing exceptions further (#662)

Bugfix: We must not throw exceptions to calling function until all async work we spawned has returned

1 files changed, 7 insertions, 0 deletions

diff --git a/src/zenstore/cas.cpp b/src/zenstore/cas.cpp
index b20f2049a..f1a141ca0 100644
--- a/src/zenstore/cas.cpp
+++ b/src/zenstore/cas.cpp
@@ -119,6 +119,13 @@ CasImpl::Initialize(const CidStoreConfiguration& InConfig)
 		}}));
 		for (std::future<void>& Result : Work)
 		{
+			if (Result.valid())
+			{
+				Result.wait();
+			}
+		}
+		for (std::future<void>& Result : Work)
+		{
 			Result.get();
 		}
 	}