1 files changed, 25 insertions, 2 deletions

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index bb4061a7..e2728d7f 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -523,7 +523,8 @@ static HRESULT RunNormal(
     )
 {
     HRESULT hr = S_OK;
-    HANDLE hPipesCreatedEvent = NULL;
+    LPWSTR sczOriginalSource = NULL;
+    LPWSTR sczCopiedOriginalSource = NULL;
     BOOL fContinueExecution = TRUE;
     BOOL fReloadApp = FALSE;
     BOOL fSkipCleanup = FALSE;
@@ -558,6 +559,27 @@ static HRESULT RunNormal(
     hr = CoreQueryRegistration(pEngineState);
     ExitOnFailure(hr, "Failed to query registration.");
 
+    // Best effort to set the source of attached containers to BURN_BUNDLE_ORIGINAL_SOURCE.
+    hr = VariableGetString(&pEngineState->variables, BURN_BUNDLE_ORIGINAL_SOURCE, &sczOriginalSource);
+    if (SUCCEEDED(hr))
+    {
+        for (DWORD i = 0; i < pEngineState->containers.cContainers; ++i)
+        {
+            BURN_CONTAINER* pContainer = pEngineState->containers.rgContainers + i;
+            if (pContainer->fAttached)
+            {
+                hr = StrAllocString(&sczCopiedOriginalSource, sczOriginalSource, 0);
+                if (SUCCEEDED(hr))
+                {
+                    ReleaseNullStr(pContainer->sczSourcePath);
+                    pContainer->sczSourcePath = sczCopiedOriginalSource;
+                    sczCopiedOriginalSource = NULL;
+                }
+            }
+        }
+    }
+    hr = S_OK;
+
     // Set some built-in variables before loading the BA.
     hr = PlanSetVariables(pEngineState->command.action, &pEngineState->variables);
     ExitOnFailure(hr, "Failed to set action variables.");
@@ -613,7 +635,8 @@ LExit:
         ::PostMessageW(pEngineState->command.hwndSplashScreen, WM_CLOSE, 0, 0);
     }
 
-    ReleaseHandle(hPipesCreatedEvent);
+    ReleaseStr(sczOriginalSource);
+    ReleaseStr(sczCopiedOriginalSource);
 
     return hr;
 }