diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-31 17:06:35 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-08-09 10:33:49 -0600 |
| commit | d21eed76c48960707561c45c492c10a6a23c052e (patch) | |
| tree | ebab09d099a699a24801fcfb4d7152cf82cc4a06 /src/engine/apply.cpp | |
| parent | ad80d6dc10f9bd6cb6a084857a8fb546cc55e756 (diff) | |
| download | wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.gz wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.bz2 wix-d21eed76c48960707561c45c492c10a6a23c052e.zip | |
WIXFEAT:4763 Change "string" variable type to literal and add "formatted".
Diffstat (limited to 'src/engine/apply.cpp')
| -rw-r--r-- | src/engine/apply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp index eae7c681..9a0f64e1 100644 --- a/src/engine/apply.cpp +++ b/src/engine/apply.cpp | |||
| @@ -272,7 +272,7 @@ extern "C" HRESULT ApplySetVariables( | |||
| 272 | { | 272 | { |
| 273 | HRESULT hr = S_OK; | 273 | HRESULT hr = S_OK; |
| 274 | 274 | ||
| 275 | hr = VariableSetString(pVariables, BURN_BUNDLE_FORCED_RESTART_PACKAGE, NULL, TRUE); | 275 | hr = VariableSetString(pVariables, BURN_BUNDLE_FORCED_RESTART_PACKAGE, NULL, TRUE, FALSE); |
| 276 | ExitOnFailure(hr, "Failed to set the bundle forced restart package built-in variable."); | 276 | ExitOnFailure(hr, "Failed to set the bundle forced restart package built-in variable."); |
| 277 | 277 | ||
| 278 | LExit: | 278 | LExit: |
| @@ -2493,7 +2493,7 @@ static HRESULT ExecutePackageComplete( | |||
| 2493 | if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == *pRestart) | 2493 | if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == *pRestart) |
| 2494 | { | 2494 | { |
| 2495 | // Best effort to set the forced restart package variable. | 2495 | // Best effort to set the forced restart package variable. |
| 2496 | VariableSetString(pVariables, BURN_BUNDLE_FORCED_RESTART_PACKAGE, pPackage->sczId, TRUE); | 2496 | VariableSetString(pVariables, BURN_BUNDLE_FORCED_RESTART_PACKAGE, pPackage->sczId, TRUE, FALSE); |
| 2497 | } | 2497 | } |
| 2498 | 2498 | ||
| 2499 | // If we're retrying, leave a message in the log file and say everything is okay. | 2499 | // If we're retrying, leave a message in the log file and say everything is okay. |