Skip to content

Commit

Permalink
fix splitting up in wpfrunspace & catch errors
Browse files Browse the repository at this point in the history
  • Loading branch information
MyDrift-user committed Aug 25, 2024
1 parent cb6898d commit a4d1d0f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions functions/private/Invoke-WinUtilTweaks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function Invoke-WinUtilTweaks {
Write-Debug "Service $($service.Name) was changed in the past to $($service.StartType.ToString()) from it's original type of $($psitem.$($values.OriginalService)), will not change it to $($psitem.$($values.service))"
$changeservice = $false
}
} catch [System.ServiceProcess.ServiceNotFoundException] {
Write-Warning "Service $($psitem.Name) was not found"
} catch {
# do nothing
}
}

Expand Down
6 changes: 1 addition & 5 deletions functions/private/Set-WinUtilService.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ Function Set-WinUtilService {

# Service exists, proceed with changing properties
$service | Set-Service -StartupType $StartupType -ErrorAction Stop
} catch [System.ServiceProcess.ServiceNotFoundException] {
Write-Warning "Service $Name was not found"
} catch {
Write-Warning "Unable to set $Name due to unhandled exception"
Write-Warning $_.Exception.Message
# do nothing
}

}
7 changes: 4 additions & 3 deletions functions/public/Invoke-WPFRunspace.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ function Invoke-WPFRunspace {
Param (
$ScriptBlock,
$ArgumentList,
$DebugPreference,
$automation
$DebugPreference
)

if ($automation = $true) {
if ($PARAM_RUN) {
write-host "Running in Main Thread"
& $ScriptBlock @ArgumentList @DebugPreference
} else {
write-host "Running in Runspace"
# Create a PowerShell instance
$script:powershell = [powershell]::Create()

Expand Down

0 comments on commit a4d1d0f

Please sign in to comment.