Exception wrapping

seerge · May 2, 2024 · ba0bac1 · ba0bac1
1 parent 8241700
commit ba0bac1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/Display/ScreenNative.cs b/app/Display/ScreenNative.cs
@@ -166,7 +166,8 @@ string pProfileName
         {
             try
             {
-                var devices = GetAllDevices().ToArray();
+                var devicesList = GetAllDevices();
+                var devices = devicesList.ToArray();
                 string internalName = AppConfig.GetString("internal_display");
 
                 foreach (var device in devices)

diff --git a/app/Helpers/ClamshellModeControl.cs b/app/Helpers/ClamshellModeControl.cs
@@ -15,22 +15,29 @@ public ClamshellModeControl()
 
         public bool IsExternalDisplayConnected()
         {
-            var devices = ScreenInterrogatory.GetAllDevices().ToArray();
+            try
+            {
+                var devicesList = ScreenInterrogatory.GetAllDevices();
+                var devices = devicesList.ToArray();
 
-            string internalName = AppConfig.GetString("internal_display");
+                string internalName = AppConfig.GetString("internal_display");
 
-            foreach (var device in devices)
-            {
-                if (device.outputTechnology != ScreenInterrogatory.DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY.DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL &&
-                    device.outputTechnology != ScreenInterrogatory.DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY.DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED
-                    && device.monitorFriendlyDeviceName != internalName)
+                foreach (var device in devices)
                 {
-                    Logger.WriteLine("Found external screen: " + device.monitorFriendlyDeviceName + ":" + device.outputTechnology.ToString());
+                    if (device.outputTechnology != ScreenInterrogatory.DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY.DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL &&
+                        device.outputTechnology != ScreenInterrogatory.DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY.DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED
+                        && device.monitorFriendlyDeviceName != internalName)
+                    {
+                        Logger.WriteLine("Found external screen: " + device.monitorFriendlyDeviceName + ":" + device.outputTechnology.ToString());
 
-                    //Already found one, we do not have to check whether there are more
-                    return true;
-                }
+                        //Already found one, we do not have to check whether there are more
+                        return true;
+                    }
 
+                }
+            } catch (Exception ex)
+            {
+                Logger.WriteLine(ex.ToString());
             }
 
             return false;