Merge 508cce8827 into eb221c3e49

FFMpegCore.Test/FFMpegArgumentProcessorTest.cs

@@ -1,6 +1,9 @@
 using System.Reflection;
 using FFMpegCore.Arguments;
+using FFMpegCore.Exceptions;
+using FFMpegCore.Helpers;
 using FluentAssertions;
+using Instances.Exceptions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace FFMpegCore.Test
@@ -99,5 +102,12 @@ public void Audible_Aax_Test()
             var arg = new AudibleEncryptionKeyArgument("62689101");
             arg.Text.Should().Be($"-activation_bytes 62689101");
         }
+
+        [TestMethod]
+        public void Throws_FFMpegException_when_ffmpeg_not_found()
+        {
+            var exception = Assert.ThrowsException<FFMpegException>(() => FFMpegHelper.VerifyFFMpegExists(new FFOptions { BinaryFolder = "./folder/that/does/not/exist" }));
+            Assert.IsInstanceOfType<InstanceFileNotFoundException>(exception.InnerException);
+        }
     }
 }

FFMpegCore/Helpers/FFMpegHelper.cs

@@ -42,8 +42,16 @@ public static void VerifyFFMpegExists(FFOptions ffMpegOptions)
                 return;
             }
 
-            var result = Instance.Finish(GlobalFFOptions.GetFFMpegBinaryPath(ffMpegOptions), "-version");
-            _ffmpegVerified = result.ExitCode == 0;
+            try
+            {
+                var result = Instance.Finish(GlobalFFOptions.GetFFMpegBinaryPath(ffMpegOptions), "-version");
+                _ffmpegVerified = result.ExitCode == 0;
+            }
+            catch (Exception e)
+            {
+                throw new FFMpegException(FFMpegExceptionType.Operation, "ffmpeg was not found on your system", e);
+            }
+
             if (!_ffmpegVerified)
             {
                 throw new FFMpegException(FFMpegExceptionType.Operation, "ffmpeg was not found on your system");