OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / QueryGenerator.cs
index f0d1992..a6c59ee 100644 (file)
@@ -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.MaximumWidth == 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.MaximumHeight == 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