Change path priority

Mupen64-Rewrite · Oct 19, 2023 · 9c759d4 · 9c759d4
1 parent 7f6ae84
commit 9c759d4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/M64RPFW.Views.Avalonia/Program.cs b/M64RPFW.Views.Avalonia/Program.cs
@@ -70,18 +70,20 @@ private static void SetupConsole()
     private static void InitLibraries()
     {
         if (OperatingSystem.IsWindows())
-            return;
-        if (OperatingSystem.IsLinux())
         {
-            if (File.Exists("/lib/libavcodec.so"))
-                ffmpeg.RootPath = "/lib";
-            else if (File.Exists("/usr/lib/libavcodec.so"))
-                ffmpeg.RootPath = "/usr/lib";
-            else if (File.Exists("/lib64/libavcodec.so"))
+            // we don't need to do anything because FFmpeg
+            // is bundled in
+        }
+        else if (OperatingSystem.IsLinux())
+        {
+            if (File.Exists("/lib64/libavcodec.so"))
                 ffmpeg.RootPath = "/lib64";
             else if (File.Exists("/usr/lib64/libavcodec.so"))
                 ffmpeg.RootPath = "/usr/lib64";
-            return;
+            else if (File.Exists("/lib/libavcodec.so"))
+                ffmpeg.RootPath = "/lib";
+            else if (File.Exists("/usr/lib/libavcodec.so"))
+                ffmpeg.RootPath = "/usr/lib";
         }
         if (OperatingSystem.IsMacOS())
         {