From 4c9aff0d3faad32f9f379f1125c3d470a821afd2 Mon Sep 17 00:00:00 2001
From: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com>
Date: Mon, 27 May 2024 17:39:56 -0400
Subject: [PATCH] Update SettingsMenu.ps1

Fixed a bug in #81
---
 MiniClients/SettingsMenu.ps1 | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/MiniClients/SettingsMenu.ps1 b/MiniClients/SettingsMenu.ps1
index 813f840..fcbfadb 100644
--- a/MiniClients/SettingsMenu.ps1
+++ b/MiniClients/SettingsMenu.ps1
@@ -598,29 +598,35 @@ function Open-SettingsMenu {
         $saveSettingsButton = New-Object System.Windows.Forms.Button
         $saveSettingsButton.Location = New-Object System.Drawing.Size(9, 20)
         $saveSettingsButton.Size = New-Object System.Drawing.Size(348, 50)
-        $saveSettingsButton.Text = "Save And Restart ETT"
+        $saveSettingsButton.Text = "Save And Exit"
         $saveSettingsButton.Font = New-Object System.Drawing.Font("Segoe UI", 10, [System.Drawing.FontStyle]::Bold)
         $saveSettingsButton.BackColor = $BoxColor
         $saveSettingsButton.ForeColor = $ButtonTextColor
         $saveSettingsButton.Add_Click({
+                #IF logo location is blank, set to null
+                if ($logoLocationTextBox.Text -eq "") {
+                    $logolocationresult = $null
+                }else{
+                    $logolocationresult = $logoLocationTextBox.Text
+                }
                 #Load the settings file
                 $settings = Get-Content -Path ".\ETTConfig.json" | ConvertFrom-Json
-                #Update the settings file with the new values
+                #Update the settings file with the new values - if blank, set to null
                 $settings.AutoUpdateCheckerEnabled = $autoUpdateCheckerEnabledCheckBox.Checked
                 $settings.AdminMode = $adminModeCheckBox.Checked
                 $settings.BrandColor = $brandColorTextBox.Text
-                $settings.LogoLocation = $logoLocationTextBox.Text
+                $settings.LogoLocation = $logolocationresult
                 $settings.BackgroundImagePath = $backgroundImagePathTextBox.Text
                 $settings.ETTApplicationTitle = $ETTApplicationTitleTextBox.Text
                 $settings.ETTHeaderText = $ETTHeaderTextTextBox.Text
                 $settings.ETTHeaderTextColor = $ETTHeaderTextColorTextBox.Text
                 $settings.ApplicationTimeoutEnabled = $applicationTimeoutEnabledCheckBox.Checked
-                $settings.ApplicationTimeoutLength = $applicationTimeoutLengthTextBox.Text
+                $settings.ApplicationTimeoutLength = [int]$applicationTimeoutLengthTextBox.Text
                 $settings.EnableCustomTools = $enableCustomToolsCheckBox.Checked
                 $settings.RAMCheckActive = $RAMCheckActiveCheckBox.Checked
-                $settings.RAMCheckMinimum = $RAMCheckMinimumTextBox.Text
+                $settings.RAMCheckMinimum = [int]$RAMCheckMinimumTextBox.Text
                 $settings.DriveSpaceCheckActive = $DriveSpaceCheckActiveCheckBox.Checked
-                $settings.DriveSpaceCheckMinimum = $DriveSpaceCheckMinimumTextBox.Text
+                $settings.DriveSpaceCheckMinimum = [double]$DriveSpaceCheckMinimumTextBox.Text
                 $settings.WinVersionCheckActive = $WinVersionCheckActiveCheckBox.Checked
                 $settings.WinVersionTarget = $WinVersionTargetTextBox.Text
                 $settings.AzureADTenantId = $AzureADTenantIdTextBox.Text