From 211b855e8a8e9b86a293a3872db717b1f58d9530 Mon Sep 17 00:00:00 2001
From: Serge <5920850+seerge@users.noreply.github.com>
Date: Thu, 7 Mar 2024 15:19:41 +0100
Subject: [PATCH] No overdrive for OLED

---
 app/AppConfig.cs             | 5 +++++
 app/Display/ScreenControl.cs | 8 ++++----
 app/Extra.cs                 | 7 ++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/AppConfig.cs b/app/AppConfig.cs
index eebb4411..9c0899ed 100644
--- a/app/AppConfig.cs
+++ b/app/AppConfig.cs
@@ -408,6 +408,11 @@ public static class AppConfig
         return ContainsModel("OLED") || IsSlash() || ContainsModel("UX64") || ContainsModel("UX34") || ContainsModel("UX53") || ContainsModel("K360") || ContainsModel("X150") || ContainsModel("M3500"); 
     }
 
+    public static bool IsNoOverdrive()
+    {
+        return Is("no_overdrive") || IsOLED();
+    }
+
     public static bool IsStrix()
     {
         return ContainsModel("Strix") || ContainsModel("Scar") || ContainsModel("G703G");
diff --git a/app/Display/ScreenControl.cs b/app/Display/ScreenControl.cs
index 275e6578..67842ebb 100644
--- a/app/Display/ScreenControl.cs
+++ b/app/Display/ScreenControl.cs
@@ -155,8 +155,8 @@ namespace GHelper.Display
 
             if (overdrive >= 0)
             {
-                if (AppConfig.Get("no_overdrive") == 1) overdrive = 0;
-                Program.acpi.DeviceSet(AsusACPI.ScreenOverdrive, overdrive, "ScreenOverdrive");
+                if (AppConfig.IsNoOverdrive()) overdrive = 0;
+                if (!AppConfig.IsOLED()) Program.acpi.DeviceSet(AsusACPI.ScreenOverdrive, overdrive, "ScreenOverdrive");
 
             }
 
@@ -208,9 +208,9 @@ namespace GHelper.Display
             int maxFrequency = ScreenNative.GetMaxRefreshRate(laptopScreen);
 
             bool screenAuto = AppConfig.Is("screen_auto");
-            bool overdriveSetting = !AppConfig.Is("no_overdrive");
+            bool overdriveSetting = !AppConfig.IsNoOverdrive();
 
-            int overdrive = AppConfig.Is("no_overdrive") ? 0 : Program.acpi.DeviceGet(AsusACPI.ScreenOverdrive);
+            int overdrive = AppConfig.IsNoOverdrive() ? 0 : Program.acpi.DeviceGet(AsusACPI.ScreenOverdrive);
 
             int miniled1 = Program.acpi.DeviceGet(AsusACPI.ScreenMiniled1);
             int miniled2 = Program.acpi.DeviceGet(AsusACPI.ScreenMiniled2);
diff --git a/app/Extra.cs b/app/Extra.cs
index 0c1762c4..d39cffa3 100644
--- a/app/Extra.cs
+++ b/app/Extra.cs
@@ -209,6 +209,11 @@ namespace GHelper
                 checkUSBC.Visible = false;
             }
 
+            if (AppConfig.IsOLED())
+            {
+                checkNoOverdrive.Visible = false;
+            }
+
             // Change text and hide irrelevant options on the ROG Ally,
             // which is a bit of a special case piece of hardware.
             if (AppConfig.IsAlly())
@@ -356,7 +361,7 @@ namespace GHelper
             checkTopmost.Checked = AppConfig.Is("topmost");
             checkTopmost.CheckedChanged += CheckTopmost_CheckedChanged; ;
 
-            checkNoOverdrive.Checked = AppConfig.Is("no_overdrive");
+            checkNoOverdrive.Checked = AppConfig.IsNoOverdrive();
             checkNoOverdrive.CheckedChanged += CheckNoOverdrive_CheckedChanged;
 
             checkUSBC.Checked = AppConfig.Is("optimized_usbc");