WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 981e264..a6c59ee 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -119,31 +119,32 @@ namespace Handbrake.Functions
             #region Picture Settings Tab\r
 \r
             // Use MaxWidth for built-in presets and width for user settings.\r
-            if (mainWindow.PictureSettings.maxWidth == 0)\r
+            if (mainWindow.PictureSettings.PresetMaximumResolution.Width == 0)\r
             {\r
-\r
-                if (mainWindow.PictureSettings.text_width.Text != "")\r
+                if (mainWindow.PictureSettings.text_width.Value != 0)\r
                     if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1) // Prevent usage for strict anamorphic\r
                         query += " -w " + mainWindow.PictureSettings.text_width.Text;\r
             }\r
             else\r
             {\r
-                if (mainWindow.PictureSettings.text_width.Text != "")\r
+                if (mainWindow.PictureSettings.text_width.Value != 0)\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1)\r
                     query += " -X " + mainWindow.PictureSettings.text_width.Text;\r
             }\r
 \r
             // Use MaxHeight for built-in presets and height for user settings.\r
-            if (mainWindow.PictureSettings.maxHeight == 0)\r
+            if (mainWindow.PictureSettings.PresetMaximumResolution.Height == 0)\r
             {\r
-                if (mainWindow.PictureSettings.text_height.Text != "0")\r
+                if (mainWindow.PictureSettings.text_height.Value != 0)\r
                     if (mainWindow.PictureSettings.text_height.Text != "")\r
                         if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3) // Prevent usage for strict anamorphic\r
                             query += " -l " + mainWindow.PictureSettings.text_height.Text;\r
             }\r
             else\r
             {\r
-                if (mainWindow.PictureSettings.text_height.Text != "")\r
-                    query += " -Y " + mainWindow.PictureSettings.text_height.Text;\r
+                if (mainWindow.PictureSettings.text_height.Value != 0)\r
+                    if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 0 || mainWindow.PictureSettings.drp_anamorphic.SelectedIndex == 3)\r
+                        query += " -Y " + mainWindow.PictureSettings.text_height.Text;\r
             }\r
 \r
             string cropTop = mainWindow.PictureSettings.crop_top.Text;\r
@@ -175,11 +176,11 @@ namespace Handbrake.Functions
                     break;\r
                 case 3:\r
                     query += " --custom-anamorphic ";\r
-                    query += " --display-width " + mainWindow.PictureSettings.txt_displayWidth.Text + " ";\r
+                    query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
                     if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
                         query += " --keep-display-aspect ";\r
-                    if (mainWindow.PictureSettings.txt_parWidth.Text != "" && mainWindow.PictureSettings.txt_parHeight.Text != "")\r
-                        query += " --pixel-aspect " + mainWindow.PictureSettings.txt_parWidth.Text + ":" + mainWindow.PictureSettings.txt_parHeight.Text + " ";\r
+                    if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")\r
+                        query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";\r
                     break;\r
             }\r
             #endregion\r