diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-03 15:30:50 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-04 10:05:21 -0500 |
| commit | 29f7e00586412163a20e298fbf84505f8a917425 (patch) | |
| tree | 30257a3544f6982ded159443ebed0eb933f11a51 /src/burn/engine/core.cpp | |
| parent | 41d2c12d60ee84cefc26ec99abb328701883c8f5 (diff) | |
| download | wix-29f7e00586412163a20e298fbf84505f8a917425.tar.gz wix-29f7e00586412163a20e298fbf84505f8a917425.tar.bz2 wix-29f7e00586412163a20e298fbf84505f8a917425.zip | |
Only block shutdown during Apply.
Diffstat (limited to 'src/burn/engine/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index ec996c4c..19b739f9 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -681,6 +681,8 @@ extern "C" HRESULT CoreApply( | |||
| 681 | hr = ApplyLock(FALSE, &hLock); | 681 | hr = ApplyLock(FALSE, &hLock); |
| 682 | ExitOnFailure(hr, "Another per-user setup is already executing."); | 682 | ExitOnFailure(hr, "Another per-user setup is already executing."); |
| 683 | 683 | ||
| 684 | pEngineState->plan.fApplying = TRUE; | ||
| 685 | |||
| 684 | // Initialize only after getting a lock. | 686 | // Initialize only after getting a lock. |
| 685 | fApplyInitialize = TRUE; | 687 | fApplyInitialize = TRUE; |
| 686 | ApplyInitialize(); | 688 | ApplyInitialize(); |
| @@ -814,6 +816,8 @@ LExit: | |||
| 814 | ApplyUninitialize(); | 816 | ApplyUninitialize(); |
| 815 | } | 817 | } |
| 816 | 818 | ||
| 819 | pEngineState->plan.fApplying = FALSE; | ||
| 820 | |||
| 817 | if (hLock) | 821 | if (hLock) |
| 818 | { | 822 | { |
| 819 | ::ReleaseMutex(hLock); | 823 | ::ReleaseMutex(hLock); |
