From be133cd23888313b199ba83f2fdad94c4c4b35a2 Mon Sep 17 00:00:00 2001
From: seerge <serge@asus>
Date: Tue, 7 Mar 2023 21:19:04 +0100
Subject: [PATCH] Minor fixes

---
 NativeMethods.cs | 16 +++++++++-------
 Program.cs       |  3 +++
 Settings.cs      |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/NativeMethods.cs b/NativeMethods.cs
index fbb451c4..5e45fa1e 100644
--- a/NativeMethods.cs
+++ b/NativeMethods.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;
 using System.Management;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
 public class NativeMethods
 {
@@ -258,24 +259,25 @@ public class NativeMethods
         {
             if ((d.StateFlags & DisplayDeviceStateFlags.AttachedToDesktop) != 0)
             {
+                //Debug.WriteLine(d.DeviceID);
+                //Debug.WriteLine(d.DeviceName);
                 if (counter == deviceNum)
                 {
                     laptopScreen = d.DeviceName;
-                    //Debug.WriteLine(d.DeviceID);
-                    //Debug.WriteLine(d.DeviceName);
                 }
                 counter++;
             }
 
         }
 
-        /*
-        if (laptopScreen is null)
+        // Mismatch between active screens and enumerated screens, fallback to old method
+        if (counter != activeScreens.Count)
         {
-            foreach (var screen in screens)
-                Debug.WriteLine(screen.DeviceName);
+            laptopScreen = null;
+            foreach (var screen in Screen.AllScreens)
+                if (screen.DeviceName == laptopScreenName)
+                    laptopScreen = screen.DeviceName;
         }
-        */
 
         return laptopScreen;
     }
diff --git a/Program.cs b/Program.cs
index 7cc72c5d..2c10e7a3 100644
--- a/Program.cs
+++ b/Program.cs
@@ -96,6 +96,9 @@ namespace GHelper
         private static void SetAutoModes()
         {
             PowerLineStatus isPlugged = SystemInformation.PowerStatus.PowerLineStatus;
+
+            Debug.WriteLine(isPlugged.ToString());
+
             settingsForm.AutoGPUMode(isPlugged);
             settingsForm.AutoScreen(isPlugged);
             settingsForm.AutoPerformance(isPlugged);
diff --git a/Settings.cs b/Settings.cs
index 0f1e6ccd..162cd282 100644
--- a/Settings.cs
+++ b/Settings.cs
@@ -97,6 +97,8 @@ namespace GHelper
 
         }
 
+
+
         private void CheckMatrix_CheckedChanged(object? sender, EventArgs e)
         {
             if (sender is null) return;