Merge 08abafe83a into 39bba4dda9

Directory.build.props

@@ -3,7 +3,7 @@
     <Company>ShareX Team</Company>
     <Product>ShareX</Product>
     <Copyright>Copyright (c) 2007-2024 ShareX Team</Copyright>
-    <Version>16.0.3</Version>
+    <Version>16.0.4</Version>
     <EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

ShareX.Setup/Program.cs

@@ -93,7 +93,7 @@ namespace ShareX.Setup
         private static string MakeAppxPath => Path.Combine(WindowsKitsDir, "x64", "makeappx.exe");
 
         private const string InnoSetupCompilerPath = @"C:\Program Files (x86)\Inno Setup 6\ISCC.exe";
-        private const string FFmpegDownloadURL = "https://github.com/ShareX/FFmpeg/releases/download/v6.1/ffmpeg-6.1-win64.zip";
+        private const string FFmpegDownloadURL = "https://github.com/ShareX/FFmpeg/releases/download/v7.0/ffmpeg-7.0-win64.zip";
 
         private static void Main(string[] args)
         {

ShareX.UploadersLib/ShareX.UploadersLib.csproj

@@ -16,7 +16,7 @@
     <EmbeddedResource Include="APIKeys\jira_sharex.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentFTP" Version="49.0.2" />
+    <PackageReference Include="FluentFTP" Version="50.0.1" />
     <PackageReference Include="MegaApiClient" Version="1.10.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />

ShareX/TaskHelpers.cs

@@ -1312,10 +1312,11 @@ namespace ShareX
         {
             if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
 
-            await OCRImage(bmp, taskSettings.CaptureSettingsReference.OCROptions, filePath);
+            bool notificationsEnabled = taskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted;
+            await OCRImage(bmp, taskSettings.CaptureSettingsReference.OCROptions, filePath, notificationsEnabled);
         }
 
-        private static async Task OCRImage(Bitmap bmp, OCROptions options, string filePath = null)
+        private static async Task OCRImage(Bitmap bmp, OCROptions options, string filePath = null, bool notificationsEnabled = true)
         {
             try
             {
@@ -1325,7 +1326,7 @@ namespace ShareX
                 {
                     if (options.Silent)
                     {
-                        await AsyncOCRImage(bmp, options, filePath);
+                        await AsyncOCRImage(bmp, options, filePath, notificationsEnabled);
                     }
                     else
                     {
@@ -1348,9 +1349,9 @@ namespace ShareX
             }
         }
 
-        private static async Task AsyncOCRImage(Bitmap bmp, OCROptions options, string filePath = null)
+        private static async Task AsyncOCRImage(Bitmap bmp, OCROptions options, string filePath = null, bool notificationsEnabled = true)
         {
-            ShowNotificationTip(Resources.OCRForm_AutoProcessing);
+            if (notificationsEnabled) ShowNotificationTip(Resources.OCRForm_AutoProcessing);
 
             string result = null;
 
@@ -1372,11 +1373,11 @@ namespace ShareX
                     File.WriteAllText(textFilePath, result, Encoding.UTF8);
                 }
 
-                ShowNotificationTip(Resources.OCRForm_AutoComplete);
+                if (notificationsEnabled) ShowNotificationTip(Resources.OCRForm_AutoComplete);
             }
             else
             {
-                ShowNotificationTip(Resources.OCRForm_AutoCompleteFail);
+                if (notificationsEnabled) ShowNotificationTip(Resources.OCRForm_AutoCompleteFail);
             }
         }
 
@@ -2182,4 +2183,4 @@ namespace ShareX
             return true;
         }
     }
-}
+}