WinGui: Some issues with loading ffmpeg4 encoder via presets fixed.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4355 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 5 insertions, 3 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
index c47e7c5ef..830c074e9 100644
--- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
@@ -293,7 +293,9 @@ namespace HandBrake.ApplicationServices.Functions
         {

             switch (encoder)

             {

+                case "":

                 case "ffmpeg":

+                case "ffmpeg4":

                     return VideoEncoder.FFMpeg;

                 case "ffmpeg2":

                     return VideoEncoder.FFMpeg2;

@@ -320,7 +322,7 @@ namespace HandBrake.ApplicationServices.Functions
             switch (encoder)

             {

                 case VideoEncoder.FFMpeg:

-                    return "ffmpeg";

+                    return "ffmpeg4";

                 case VideoEncoder.FFMpeg2:

                     return "ffmpeg2";

                 case VideoEncoder.X264:

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 6e8f97fcc..a8780aa85 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -1243,8 +1243,8 @@ namespace Handbrake
             }

 

             // Add the job.

-

-            this.queueProcessor.QueueManager.Add(QueryGenerator.GenerateFullQuery(this));

+            QueueTask query = QueryGenerator.GenerateFullQuery(this);

+            this.queueProcessor.QueueManager.Add(query);

 

             lbl_encode.Text = this.queueProcessor.QueueManager.Count + " encode(s) pending in the queue";