diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index 42dfb220..a266fa1d 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |||
| @@ -228,17 +228,18 @@ public: // IBootstrapperApplication | |||
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | // If a restart was required. | 230 | // If a restart was required. |
| 231 | if (m_fRestartRequired) | 231 | if (BOOTSTRAPPER_APPLY_RESTART_NONE != m_restartResult) |
| 232 | { | 232 | { |
| 233 | if (m_fAllowRestart) | 233 | if (m_fRestartRequired && m_fAllowRestart) |
| 234 | { | 234 | { |
| 235 | *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; | 235 | *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | if (m_fPrereq) | 238 | if (m_fPrereq) |
| 239 | { | 239 | { |
| 240 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, m_fAllowRestart ? "The prerequisites scheduled a restart. The bootstrapper application will be reloaded after the computer is restarted." | 240 | BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART == *pAction |
| 241 | : "A restart is required by the prerequisites but the user delayed it. The bootstrapper application will be reloaded after the computer is restarted."); | 241 | ? "The prerequisites scheduled a restart. The bootstrapper application will be reloaded after the computer is restarted." |
| 242 | : "A restart is required by the prerequisites but the user delayed it. The bootstrapper application will be reloaded after the computer is restarted."); | ||
| 242 | } | 243 | } |
| 243 | } | 244 | } |
| 244 | else if (m_fPrereqInstalled) | 245 | else if (m_fPrereqInstalled) |
