Always send OnCacheAcquireProgress at least once per payload.

Always send OnCacheAcquireProgress between OnCacheAcquireBegin and OnCacheAcquireComplete.
Track the successful cache acquisition progress during the final progress call.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp
index cfe4893b..a37dcc89 100644
--- a/src/engine/plan.cpp
+++ b/src/engine/plan.cpp
@@ -1010,7 +1010,13 @@ extern "C" HRESULT PlanLayoutContainer(
     }
     else
     {
-        pPlan->qwCacheSizeTotal += 2 * pContainer->qwFileSize;
+        if (!pContainer->fActuallyAttached)
+        {
+            pPlan->qwCacheSizeTotal += pContainer->qwFileSize;
+        }
+
+        // TODO: This should be the sum of all uncompressed payloads in the container, ideally restricted to the payloads that were actually planned.
+        pPlan->qwCacheSizeTotal += pContainer->qwFileSize;
     }
 
     if (!pContainer->sczUnverifiedPath)