Prompt after failure to create restore point (#469)

This commit is contained in:
Jeffrey
2026-02-15 16:54:01 +01:00
committed by GitHub
parent 5dcc8bffdd
commit 687c089f2e

View File

@@ -3387,6 +3387,7 @@ function ExecuteAllChanges {
function CreateSystemRestorePoint { function CreateSystemRestorePoint {
$SysRestore = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" -Name "RPSessionInterval" $SysRestore = Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore" -Name "RPSessionInterval"
$failed = $false
if ($SysRestore.RPSessionInterval -eq 0) { if ($SysRestore.RPSessionInterval -eq 0) {
# In GUI mode, skip the prompt and just try to enable it # In GUI mode, skip the prompt and just try to enable it
@@ -3406,23 +3407,24 @@ function CreateSystemRestorePoint {
if (-not $enableSystemRestoreJobDone) { if (-not $enableSystemRestoreJobDone) {
Remove-Job -Job $enableSystemRestoreJob -Force -ErrorAction SilentlyContinue Remove-Job -Job $enableSystemRestoreJob -Force -ErrorAction SilentlyContinue
Write-ToConsole "Error: Failed to enable system restore and create restore point, operation timed out" -ForegroundColor Red Write-ToConsole "Error: Failed to enable system restore and create restore point, operation timed out" -ForegroundColor Red
return $failed = $true
} }
else { else {
$result = Receive-Job $enableSystemRestoreJob $result = Receive-Job $enableSystemRestoreJob
Remove-Job -Job $enableSystemRestoreJob -ErrorAction SilentlyContinue Remove-Job -Job $enableSystemRestoreJob -ErrorAction SilentlyContinue
if ($result) { if ($result) {
Write-ToConsole $result -ForegroundColor Red Write-ToConsole $result -ForegroundColor Red
return $failed = $true
} }
} }
} }
else { else {
Write-ToConsole "" Write-ToConsole ""
return $failed = $true
} }
} }
if (-not $failed) {
$createRestorePointJob = Start-Job { $createRestorePointJob = Start-Job {
# Find existing restore points that are less than 24 hours old # Find existing restore points that are less than 24 hours old
try { try {
@@ -3442,7 +3444,7 @@ function CreateSystemRestorePoint {
} }
} }
else { else {
return @{ Success = $true; Message = "A recent restore point already exists, no new restore point was created"; Warning = $true } return @{ Success = $true; Message = "A recent restore point already exists, no new restore point was created" }
} }
} }
@@ -3451,24 +3453,48 @@ function CreateSystemRestorePoint {
if (-not $createRestorePointJobDone) { if (-not $createRestorePointJobDone) {
Remove-Job -Job $createRestorePointJob -Force -ErrorAction SilentlyContinue Remove-Job -Job $createRestorePointJob -Force -ErrorAction SilentlyContinue
Write-ToConsole "Error: Failed to create system restore point, operation timed out" -ForegroundColor Red Write-ToConsole "Error: Failed to create system restore point, operation timed out" -ForegroundColor Red
$failed = $true
} }
else { else {
$result = Receive-Job $createRestorePointJob $result = Receive-Job $createRestorePointJob
Remove-Job -Job $createRestorePointJob -ErrorAction SilentlyContinue Remove-Job -Job $createRestorePointJob -ErrorAction SilentlyContinue
if ($result.Success) { if ($result.Success) {
if ($result.Warning) {
Write-ToConsole $result.Message -ForegroundColor Yellow
}
else {
Write-ToConsole $result.Message Write-ToConsole $result.Message
} }
}
else { else {
Write-ToConsole $result.Message -ForegroundColor Red Write-ToConsole $result.Message -ForegroundColor Red
$failed = $true
} }
} }
} }
# Ensure that the user is aware if creating a restore point failed, and give them the option to continue without a restore point or cancel the script
if ($failed) {
if ($script:GuiConsoleOutput) {
$result = [System.Windows.MessageBox]::Show(
'Failed to create a system restore point. Do you want to continue without a restore point?',
'Restore Point Creation Failed',
[System.Windows.MessageBoxButton]::YesNo,
[System.Windows.MessageBoxImage]::Warning
)
if ($result -ne [System.Windows.MessageBoxResult]::Yes) {
$script:CancelRequested = $true
return
}
}
elseif (-not $Silent) {
Write-ToConsole "Failed to create a system restore point. Do you want to continue without a restore point? (y/n)" -ForegroundColor Yellow
if ($( Read-Host ) -ne 'y') {
$script:CancelRequested = $true
return
}
}
Write-ToConsole "Warning: Continuing without restore point" -ForegroundColor Yellow
}
}
function ShowScriptMenuOptions { function ShowScriptMenuOptions {
Do { Do {