It may be possible to wait for all entities to be loaded #696

rappen · Apr 23, 2022 · b5f4ed9 · b5f4ed9
1 parent 70fd47d
commit b5f4ed9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -1276,8 +1276,12 @@ private void LoadEntities(ConnectionDetail connectionDetail)
                         {   // Already cached
                             eventargs.Result = connectionDetail.MetadataCache;
                         }
+                        else if (settings.WaitUntilMetadataLoaded)
+                        {   // Load the cache until done
+                            eventargs.Result = connectionDetail.MetadataCacheLoader.ConfigureAwait(false).GetAwaiter().GetResult()?.EntityMetadata;
+                        }
                         else
-                        {   // Load to cache
+                        {   // Load the cache in background
                             connectionDetail.MetadataCacheLoader.ContinueWith(task =>
                             {   // Waiting for loaded
                                 SetAfterEntitiesLoaded(task.Result?.EntityMetadata);