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

1 files changed, 9 insertions, 7 deletions

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index ed2b3b2d6..248ee188e 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -129,7 +129,7 @@ namespace Handbrake.Functions
             {

                 if (mainWindow.PictureSettings.text_width.Value != 0)

                     if (mainWindow.PictureSettings.drp_anamorphic.SelectedIndex != 1)

-                    query += " -X " + mainWindow.PictureSettings.text_width.Text;

+                        query += " -X " + mainWindow.PictureSettings.text_width.Text;

             }

 

             // Use MaxHeight for built-in presets and height for user settings.

@@ -179,8 +179,10 @@ namespace Handbrake.Functions
                     query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";

                     if (mainWindow.PictureSettings.check_KeepAR.Checked)

                         query += " --keep-display-aspect ";

-                    if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")

-                        query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";

+

+                    if (!mainWindow.PictureSettings.check_KeepAR.Checked)

+                        if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")

+                            query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";

                     break;

             }

             #endregion

@@ -395,9 +397,9 @@ namespace Handbrake.Functions
                 string subtitleDefault = String.Empty;

 

                 // SRT

-                string srtFile = String.Empty; 

+                string srtFile = String.Empty;

                 string srtCodeset = String.Empty;

-                string srtOffset = String.Empty; 

+                string srtOffset = String.Empty;

                 string srtLang = String.Empty;

                 string srtDefault = String.Empty;

                 int srtCount = 0;

@@ -420,7 +422,7 @@ namespace Handbrake.Functions
                         }

                         if (item.SubItems[4].Text == "Yes") // default

                             srtDefault = srtCount.ToString();

-                            

+

                         itemToAdd = item.SubItems[5].Text;

                         srtFile += srtFile == "" ? itemToAdd : "," + itemToAdd;

 

@@ -430,7 +432,7 @@ namespace Handbrake.Functions
                     else // We have Bitmap or CC

                     {

                         string[] tempSub;

-        

+

                         // Find --subtitle <string>

                         if (item.SubItems[1].Text.Contains("Foreign Audio Search"))

                             itemToAdd = "scan";