From 95f344722ce34dde75408bce4138fe47b7eef6d0 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Sat, 11 Sep 2021 16:20:49 +0200
Subject: [PATCH 1/2] Don't set ffmpeg path from null to its Display value +
 add 404

---
 .../Encoder/MediaEncoder.cs                     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4cbd1bbc80..057293b664 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -151,6 +151,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <param name="pathType">The path type.</param>
         public void UpdateEncoderPath(string path, string pathType)
         {
+            var config = _configurationManager.GetEncodingOptions();
+
+            // Filesystem may not be case insensitive, but EncoderAppPathDisplay should always point to a valid file?
+            if (string.IsNullOrEmpty(config.EncoderAppPath)
+                && string.Equals(config.EncoderAppPathDisplay, path, StringComparison.OrdinalIgnoreCase))
+            {
+                _logger.LogDebug("Existing ffmpeg path is empty and the new path is the same as {EncoderAppPathDisplay}. Skipping", nameof(config.EncoderAppPathDisplay));
+                return;
+            }
+
             string newPath;
 
             _logger.LogInformation("Attempting to update encoder path to {Path}. pathType: {PathType}", path ?? string.Empty, pathType ?? string.Empty);
@@ -183,9 +193,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
             }
 
+            // Don't save an invalid path
+            if (!File.Exists(path))
+            {
+                throw new FileNotFoundException();
+            }
+
             // Write the new ffmpeg path to the xml as <EncoderAppPath>
             // This ensures its not lost on next startup
-            var config = _configurationManager.GetEncodingOptions();
             config.EncoderAppPath = newPath;
             _configurationManager.SaveConfiguration("encoding", config);
 

From a353081ea33b3f635e9472371f228bab63669347 Mon Sep 17 00:00:00 2001
From: Claus Vium <cvium@users.noreply.github.com>
Date: Tue, 21 Sep 2021 22:54:11 +0200
Subject: [PATCH 2/2] Update MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 057293b664..22ed9a8eb3 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -193,12 +193,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
             }
 
-            // Don't save an invalid path
-            if (!File.Exists(path))
-            {
-                throw new FileNotFoundException();
-            }
-
             // Write the new ffmpeg path to the xml as <EncoderAppPath>
             // This ensures its not lost on next startup
             config.EncoderAppPath = newPath;