From 63515c9b6c1df685d5bfa4aa622e302e0ffda95b Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Sun, 1 Sep 2024 20:15:45 +0100
Subject: [PATCH] Cleanup

---
 .../MoltenVK/MVKInitialization.cs             | 25 ++++++++++---------
 src/Ryujinx.Headless.SDL2/Program.cs          |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs b/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
index ec46091da7..930d6b5259 100644
--- a/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
+++ b/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
@@ -9,6 +9,8 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
     [SupportedOSPlatform("macos")]
     public static partial class MVKInitialization
     {
+        private const string VulkanLib = "libvulkan.dylib";
+
         [LibraryImport("libMoltenVK.dylib")]
         private static partial Result vkGetMoltenVKConfigurationMVK(IntPtr unusedInstance, out MVKConfiguration config, in IntPtr configSize);
 
@@ -31,20 +33,19 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
             vkSetMoltenVKConfigurationMVK(IntPtr.Zero, config, configSize);
         }
 
+        private static string[] Resolver(string path)
+        {
+            if (path.EndsWith(VulkanLib))
+            {
+                path = path[..^VulkanLib.Length] + "libMoltenVK.dylib";
+                return [path];
+            }
+            return Array.Empty<string>();
+        }
+
         public static void InitializeResolver()
         {
-            Func<string, string[]> mvkResolver = (string path) =>
-            {
-                if (path.EndsWith("libvulkan.dylib")) 
-                {
-                    path = path.Substring(0, path.Length - "libvulkan.dylib".Length) + "libMoltenVK.dylib";
-                    return [ path ];
-                }
-
-                return Array.Empty<string>();
-            };
-
-            ((DefaultPathResolver)PathResolver.Default).Resolvers.Insert(0, mvkResolver);
+            ((DefaultPathResolver)PathResolver.Default).Resolvers.Insert(0, Resolver);
         }
     }
 }
diff --git a/src/Ryujinx.Headless.SDL2/Program.cs b/src/Ryujinx.Headless.SDL2/Program.cs
index ff54f87aad..5c30cd18fb 100644
--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@@ -1,4 +1,4 @@
-using CommandLine;
+using CommandLine;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Common;