WinGui:

- QueryGenerator: Don't use --pixel-aspect when using --keep-display-aspect

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

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index ed2b3b2d699abbb771f0efb7db29a9a03153d744..248ee188e7898be6ef4b870d4e7d723130b990f9 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -129,7 +129,7 @@ namespace Handbrake.Functions
             {\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
+                        query += " -X " + mainWindow.PictureSettings.text_width.Text;\r
             }\r
 \r
             // Use MaxHeight for built-in presets and height for user settings.\r
@@ -179,8 +179,10 @@ namespace Handbrake.Functions
                     query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";\r
                     if (mainWindow.PictureSettings.check_KeepAR.Checked)\r
                         query += " --keep-display-aspect ";\r
-                    if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")\r
-                        query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";\r
+\r
+                    if (!mainWindow.PictureSettings.check_KeepAR.Checked)\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
@@ -395,9 +397,9 @@ namespace Handbrake.Functions
                 string subtitleDefault = String.Empty;\r
 \r
                 // SRT\r
-                string srtFile = String.Empty; \r
+                string srtFile = String.Empty;\r
                 string srtCodeset = String.Empty;\r
-                string srtOffset = String.Empty; \r
+                string srtOffset = String.Empty;\r
                 string srtLang = String.Empty;\r
                 string srtDefault = String.Empty;\r
                 int srtCount = 0;\r
@@ -420,7 +422,7 @@ namespace Handbrake.Functions
                         }\r
                         if (item.SubItems[4].Text == "Yes") // default\r
                             srtDefault = srtCount.ToString();\r
-                            \r
+\r
                         itemToAdd = item.SubItems[5].Text;\r
                         srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;\r
 \r
@@ -430,7 +432,7 @@ namespace Handbrake.Functions
                     else // We have Bitmap or CC\r
                     {\r
                         string[] tempSub;\r
-        \r
+\r
                         // Find --subtitle <string>\r
                         if (item.SubItems[1].Text.Contains("Foreign Audio Search"))\r
                             itemToAdd = "scan";\r