Ensure DialogExpiryDuration is never less than a specified countdown.

mjr4077au · mjr4077au · commit fc87ed226a1d · 2026-07-02T11:59:42.000+10:00
Fixes PSAppDeployToolkit#2222.
diff --git a/src/PSAppDeployToolkit/Public/Show-ADTInstallationWelcome.ps1 b/src/PSAppDeployToolkit/Public/Show-ADTInstallationWelcome.ps1
@@ -1127,6 +1127,10 @@ function Show-ADTInstallationWelcome
                         if ($CloseProcessesCountdown -gt 0)
                         {
                             $dialogOptions.Add('CountdownDuration', [System.TimeSpan]::FromSeconds($CloseProcessesCountdown))
+                            if ($CloseProcessesCountdown -ge $adtConfig.UI.DefaultTimeout)
+                            {
+                                $dialogOptions.DialogExpiryDuration = [System.TimeSpan]::FromSeconds($CloseProcessesCountdown + 60)
+                            }
                         }
                     }
                     if ($PersistPrompt)
@@ -1136,6 +1140,10 @@ function Show-ADTInstallationWelcome
                     if (($PSBoundParameters.ContainsKey('ForceCloseProcessesCountdown') -or $PSBoundParameters.ContainsKey('ForceCountdown')) -and !$dialogOptions.ContainsKey('CountdownDuration'))
                     {
                         $dialogOptions.Add('CountdownDuration', [System.TimeSpan]::FromSeconds($CloseProcessesCountdown))
+                        if ($CloseProcessesCountdown -ge $adtConfig.UI.DefaultTimeout)
+                        {
+                            $dialogOptions.DialogExpiryDuration = [System.TimeSpan]::FromSeconds($CloseProcessesCountdown + 60)
+                        }
                     }
                     if ($HideCloseButton -and ($AllowDefer -or !$dialogOptions.ContainsKey('CountdownDuration')))
                     {

Original file line number	Diff line number	Diff line change
`@@ -1127,6 +1127,10 @@ function Show-ADTInstallationWelcome`
`1127`	`1127`	`if ($CloseProcessesCountdown -gt 0)`
`1128`	`1128`	`{`
`1129`	`1129`	`$dialogOptions.Add('CountdownDuration', [System.TimeSpan]::FromSeconds($CloseProcessesCountdown))`
	`1130`	`+ if ($CloseProcessesCountdown -ge $adtConfig.UI.DefaultTimeout)`
	`1131`	`+ {`
	`1132`	`+ $dialogOptions.DialogExpiryDuration = [System.TimeSpan]::FromSeconds($CloseProcessesCountdown + 60)`
	`1133`	`+ }`
`1130`	`1134`	`}`
`1131`	`1135`	`}`
`1132`	`1136`	`if ($PersistPrompt)`
`@@ -1136,6 +1140,10 @@ function Show-ADTInstallationWelcome`
`1136`	`1140`	`if (($PSBoundParameters.ContainsKey('ForceCloseProcessesCountdown') -or $PSBoundParameters.ContainsKey('ForceCountdown')) -and !$dialogOptions.ContainsKey('CountdownDuration'))`
`1137`	`1141`	`{`
`1138`	`1142`	`$dialogOptions.Add('CountdownDuration', [System.TimeSpan]::FromSeconds($CloseProcessesCountdown))`
	`1143`	`+ if ($CloseProcessesCountdown -ge $adtConfig.UI.DefaultTimeout)`
	`1144`	`+ {`
	`1145`	`+ $dialogOptions.DialogExpiryDuration = [System.TimeSpan]::FromSeconds($CloseProcessesCountdown + 60)`
	`1146`	`+ }`
`1139`	`1147`	`}`
`1140`	`1148`	`if ($HideCloseButton -and ($AllowDefer -or !$dialogOptions.ContainsKey('CountdownDuration')))`
`1141`	`1149`	`{`