Make gamemode check a separate function

goatcorp · Mar 13, 2024 · 78376e2 · 78376e2
1 parent 124e9b9
commit 78376e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs b/src/XIVLauncher.Core/Components/SettingsPage/Tabs/SettingsTabWine.cs
@@ -29,7 +29,7 @@ public SettingsTabWine()
                 CheckVisibility = () => RuntimeInformation.IsOSPlatform(OSPlatform.Linux),
                 CheckValidity = b =>
                 {
-                    if (b == true && !CoreEnvironmentSettings.GameModeInstalled)
+                    if (b == true && !CoreEnvironmentSettings.IsGameModeInstalled())
                         return "GameMode was not detected on your system.";
                     return null;
                 }

diff --git a/src/XIVLauncher.Core/CoreEnvironmentSettings.cs b/src/XIVLauncher.Core/CoreEnvironmentSettings.cs
@@ -39,17 +39,20 @@ public static string GetCleanEnvironmentVariable(string envvar, string badstring
         return string.Join(separator, Array.FindAll<string>(dirty.Split(separator, StringSplitOptions.RemoveEmptyEntries), s => !s.Contains(badstring)));
     }
 
-    static public bool GameModeInstalled { get; }
+    static private bool? gameModeInstalled = null;
 
-    static CoreEnvironmentSettings()
-    {  
+    static public bool IsGameModeInstalled()
+    {
+        if (gameModeInstalled is not null)
+            return gameModeInstalled ?? false;
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
             var handle = IntPtr.Zero;
-            GameModeInstalled = NativeLibrary.TryLoad("libgamemodeauto.so.0", out handle);
+            gameModeInstalled = NativeLibrary.TryLoad("libgamemodeauto.so.0", out handle);
             NativeLibrary.Free(handle);
         }
         else
-            GameModeInstalled = false;
+            gameModeInstalled = false;
+        return gameModeInstalled ?? false;
     }
 }