Avoid DisplayInformation crash on older hardware

CollapseLauncher · Nov 2, 2024 · 9273156 · 9273156
1 parent 70e2eeb
commit 9273156
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/CollapseLauncher/Classes/Helper/WindowUtility.cs b/CollapseLauncher/Classes/Helper/WindowUtility.cs
@@ -8,6 +8,7 @@
     using Microsoft.Graphics.Display;
     using Microsoft.UI;
     using Microsoft.UI.Composition.SystemBackdrops;
+    using Microsoft.UI.Dispatching;
     using Microsoft.UI.Input;
     using Microsoft.UI.Windowing;
     using Microsoft.UI.Xaml;
@@ -59,9 +60,38 @@ internal static DisplayArea? CurrentWindowDisplayArea
                 }
             }
 
-            internal static DisplayInformation? CurrentWindowDisplayInformation => CurrentWindowId.HasValue
-                ? DisplayInformation.CreateForWindowId(CurrentWindowId.Value)
-                : null;
+            internal static DisplayInformation? CurrentWindowDisplayInformation
+            {
+                get
+                {
+                    try
+                    {
+                        DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+                        if (dispatcherQueue.HasThreadAccess)
+                        {
+                            return CurrentWindowId.HasValue
+                                ? DisplayInformation.CreateForWindowId(CurrentWindowId.Value)
+                                : null;
+                        }
+                        else
+                        {
+                            DisplayInformation? displayInfoInit = null;
+                            dispatcherQueue.TryEnqueue(() =>
+                            {
+                                displayInfoInit = CurrentWindowId.HasValue
+                                    ? DisplayInformation.CreateForWindowId(CurrentWindowId.Value)
+                                    : null;
+                            });
+                            return displayInfoInit;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogWriteLine($"An error has occured while getting display information\r\n{ex}", LogType.Error, true);
+                    }
+                    return null;
+                }
+            }
 
             internal static DisplayAdvancedColorInfo? CurrentWindowDisplayColorInfo
             {

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/GenshinGameSettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/GenshinGameSettingsPage.xaml.cs
@@ -69,16 +69,18 @@ public GenshinGameSettingsPage()
                     RegistryWatcher = new RegistryMonitor(RegistryHive.CurrentUser, Path.Combine($"Software\\{CurrentGameProperty._GameVersion.VendorTypeProp.VendorType}", CurrentGameProperty._GameVersion.GamePreset.InternalGameNameInConfig!));
                     ToggleRegistrySubscribe(true);
                 });
-
+
+#nullable enable
                 // ReSharper disable once UnusedVariable
-                DisplayAdvancedColorInfo colorInfo = WindowUtility.CurrentWindowDisplayColorInfo;
+                DisplayAdvancedColorInfo? colorInfo = WindowUtility.CurrentWindowDisplayColorInfo;
 #if SIMULATEGIHDR
                 IsHDREnabled = true;
                 IsHDRSupported = true;
 #else
-                IsHDREnabled = colorInfo.CurrentAdvancedColorKind == DisplayAdvancedColorKind.HighDynamicRange;
-                IsHDRSupported = colorInfo.IsAdvancedColorKindAvailable(DisplayAdvancedColorKind.HighDynamicRange);
+                IsHDREnabled = colorInfo?.CurrentAdvancedColorKind == DisplayAdvancedColorKind.HighDynamicRange;
+                IsHDRSupported = colorInfo?.IsAdvancedColorKindAvailable(DisplayAdvancedColorKind.HighDynamicRange) ?? false;
 #endif
+#nullable restore
 
                 LoadPage();
             }