From 76a8130ce4929b1e2ce4df53aba006e3fa0eef5a Mon Sep 17 00:00:00 2001 From: Rodeo Date: Sat, 2 Nov 2013 22:29:23 +0000 Subject: WinGui: fix an issue where the value of the H.264 level and profile widgets was used even though the advanced panel was enabled (and thus the widgets were disabled and not settable by the user). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5871 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Utilities/QueryGeneratorUtility.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'win/CS/HandBrake.ApplicationServices/Utilities') diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index 241423e9d..13be72527 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -963,15 +963,18 @@ namespace HandBrake.ApplicationServices.Utilities // Options that apply to both x264 and QuickSync if (task.VideoEncoder == VideoEncoder.QuickSync || task.VideoEncoder == VideoEncoder.X264) { - if (task.H264Level != "Auto") + // when using x264 with the advanced panel, the H.264 profile/level widgets are disabled + if (!(task.VideoEncoder == VideoEncoder.X264 && task.ShowAdvancedTab)) { - query += string.Format(" --h264-level=\"{0}\" ", task.H264Level); - } - - if (task.H264Profile != x264Profile.None) - { - query += string.Format( - " --h264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty)); + if (task.H264Level != "Auto") + { + query += string.Format(" --h264-level=\"{0}\" ", task.H264Level); + } + if (task.H264Profile != x264Profile.None) + { + query += string.Format( + " --h264-profile={0} ", task.H264Profile.ToString().ToLower().Replace(" ", string.Empty)); + } } if (task.VideoEncoder == VideoEncoder.QuickSync) -- cgit v1.2.3