From c1c5aa92399a3fa1e9a0c2cfd50683a3f829b75f Mon Sep 17 00:00:00 2001
From: rbalsleyMSFT <53497092+rbalsleyMSFT@users.noreply.github.com>
Date: Tue, 17 Jun 2025 14:26:31 -0700
Subject: [PATCH] Refactor: Move initial Windows settings population to core
 module

Moves the logic for the initial population of the Windows settings comboboxes from the UI's loaded event handler into the `Initialize-UIDefaults` function.

This change centralizes UI default value setup into a single location, improving code organization and maintainability.
---
 FFUDevelopment/BuildFFUVM_UI.ps1                     | 3 ---
 FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FFUDevelopment/BuildFFUVM_UI.ps1 b/FFUDevelopment/BuildFFUVM_UI.ps1
index c0127c2..db4924b 100644
--- a/FFUDevelopment/BuildFFUVM_UI.ps1
+++ b/FFUDevelopment/BuildFFUVM_UI.ps1
@@ -151,9 +151,6 @@ $window.Add_Loaded({
 
         Register-EventHandlers -State $script:uiState
 
-        # Get Windows Settings UI using data from helper module
-        Get-WindowsSettingsCombos -isoPath $script:uiState.Defaults.windowsSettingsDefaults.DefaultISOPath -State $script:uiState
-
         $script:uiState.Controls.txtISOPath.Add_TextChanged({
                 Get-WindowsSettingsCombos -isoPath $script:uiState.Controls.txtISOPath.Text -State $script:uiState
             })
diff --git a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1 b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
index 2713d40..7258d87 100644
--- a/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
+++ b/FFUDevelopment/FFUUI.Core/FFUUI.Core.Initialize.psm1
@@ -189,7 +189,10 @@ function Initialize-UIDefaults {
     $State.Controls.txtVMLocation.Text = $State.Defaults.generalDefaults.VMLocation
     $State.Controls.txtVMNamePrefix.Text = $State.Defaults.generalDefaults.VMNamePrefix
     $State.Controls.cmbLogicalSectorSize.SelectedItem = ($State.Controls.cmbLogicalSectorSize.Items | Where-Object { $_.Content -eq $State.Defaults.generalDefaults.LogicalSectorSize.ToString() })
-
+   
+    # Populate Windows Release, Version, and SKU comboboxes
+    Get-WindowsSettingsCombos -isoPath $State.Defaults.windowsSettingsDefaults.DefaultISOPath -State $State
+    
     # Windows Settings tab defaults
     $State.Controls.cmbWindowsArch.ItemsSource = $State.Defaults.windowsSettingsDefaults.AllowedArchitectures
     $State.Controls.cmbWindowsArch.SelectedItem = $State.Defaults.windowsSettingsDefaults.DefaultWindowsArch