fix some final issues

Maassoft · Aug 2, 2024 · 18f32e1 · 18f32e1
1 parent 4ed670c
commit 18f32e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ColorControl.UI/Components/Pages/Nvidia/NvidiaDriverSettings.razor b/ColorControl.UI/Components/Pages/Nvidia/NvidiaDriverSettings.razor
@@ -150,13 +150,10 @@
 
     protected async Task LoadDriverSettings()
     {
-        if (DriverSettings == null)
+        DriverSettings = await _rpcClientService.CallAsync<List<NvSettingItemDto>>("NvService", "GetDriverSettings", CurrentProfileName);
+        if (DriverSettings != null)
         {
-            DriverSettings = await _rpcClientService.CallAsync<List<NvSettingItemDto>>("NvService", "GetDriverSettings", CurrentProfileName);
-            if (DriverSettings != null)
-            {
-                DriverSettings.ForEach(s => s.ValueChanged = false);
-            }
+            DriverSettings.ForEach(s => s.ValueChanged = false);
         }
 
         if (DriverSettings != null)

diff --git a/Shared/Contracts/NVIDIA/NvHdrSettings.cs b/Shared/Contracts/NVIDIA/NvHdrSettings.cs
@@ -1,11 +1,14 @@
-using System.Text.Json.Serialization;
+using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 namespace ColorControl.Shared.Contracts.NVIDIA
 {
     public enum NvOutputMode
     {
         Default = 0,
+        [Description("HDR10")]
         Hdr10 = 1,
+        [Description("HDR10+")]
         Hdr10Plus = 2
     }
 

diff --git a/Shared/Contracts/NVIDIA/NvPreset.cs b/Shared/Contracts/NVIDIA/NvPreset.cs
@@ -142,7 +142,7 @@ public void UpdateAutoApplySettings(NvPreset currentSettings = null, bool keepCh
 
             applyColorData = keepChanges && applyColorData || colorData.IsDifferent(currentSettings.colorData);
             applyDithering = keepChanges && applyDithering || (ditheringEnabled != currentSettings.ditheringEnabled || ditheringMode != currentSettings.ditheringMode || ditheringBits != currentSettings.ditheringBits);
-            applyHDR = keepChanges && applyHDR || (HDREnabled != currentSettings.HDREnabled || toggleHDR || SDRBrightness != currentSettings.SDRBrightness);
+            applyHDR = keepChanges && applyHDR || (HDREnabled != currentSettings.HDREnabled || toggleHDR || SDRBrightness != currentSettings.SDRBrightness || HdrSettings.OutputMode != currentSettings.HdrSettings.OutputMode);
             DisplayConfig.ApplyResolution = keepChanges && DisplayConfig.ApplyResolution || (DisplayConfig.Resolution.IsDifferent(currentSettings.DisplayConfig.Resolution) ||
                     DisplayConfig.Scaling != currentSettings.DisplayConfig.Scaling || DisplayConfig.Rotation != currentSettings.DisplayConfig.Rotation || DisplayConfig.IsPrimary != null && DisplayConfig.IsPrimary != currentSettings.DisplayConfig.IsPrimary);
             DisplayConfig.ApplyRefreshRate = keepChanges && DisplayConfig.ApplyRefreshRate || !DisplayConfig.RefreshRate.Equals(currentSettings.DisplayConfig.RefreshRate);