diff --git a/functions/public/Invoke-WPFUIElements.ps1 b/functions/public/Invoke-WPFUIElements.ps1 index 60538875..b17623ad 100644 --- a/functions/public/Invoke-WPFUIElements.ps1 +++ b/functions/public/Invoke-WPFUIElements.ps1 @@ -31,7 +31,7 @@ function Invoke-WPFUIElements { $borderstyle = $window.FindResource("BorderStyle") $HoverTextBlockStyle = $window.FindResource("HoverTextBlockStyle") $ColorfulToggleSwitchStyle = $window.FindResource("ColorfulToggleSwitchStyle") - + if (!$borderstyle -or !$HoverTextBlockStyle -or !$ColorfulToggleSwitchStyle) { throw "Failed to retrieve Styles using 'FindResource' from main window element." } diff --git a/scripts/main.ps1 b/scripts/main.ps1 index 6bfa1215..f5c9b978 100644 --- a/scripts/main.ps1 +++ b/scripts/main.ps1 @@ -84,15 +84,10 @@ try { # Load the configuration files #Invoke-WPFUIElements -configVariable $sync.configs.nav -targetGridName "WPFMainGrid" -$sync.form.Dispatcher.Invoke([action] { - Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5 -}) -$sync.form.Dispatcher.Invoke([action] { - Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2 -}) -$sync.form.Dispatcher.Invoke([action] { - Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2 -}) +Invoke-WPFUIElements -configVariable $sync.configs.applications -targetGridName "appspanel" -columncount 5 +Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2 +Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2 + #=========================================================================== # Store Form Objects In PowerShell