WinGui:

- Fixed a bug in QueryGenerator.cs

git-svn-id: svn://localhost/HandBrake/trunk@2555 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index f6ea60e..6428097 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -248,18 +248,6 @@ namespace Handbrake.Functions
                     newTrack.SubItems.Add(track.DRC);\r
                     mainWindow.audioPanel.addTrackForPreset(newTrack);\r
                 }\r
-\r
-            /*/ Subtitle Stuff\r
-            mainWindow.drp_subtitle.Text = presetQuery.Subtitles;\r
-\r
-            if (presetQuery.ForcedSubtitles)\r
-            {\r
-                mainWindow.check_forced.CheckState = CheckState.Checked;\r
-                mainWindow.check_forced.Enabled = true;\r
-            }\r
-            else\r
-                mainWindow.check_forced.CheckState = CheckState.Unchecked;*/\r
-\r
             #endregion\r
 \r
             #region Other\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 341338d..b818424 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -276,7 +276,7 @@ namespace Handbrake.Functions
             foreach (ListViewItem row in audioTracks.Items)\r
             {\r
                 // Audio Track (-a)\r
-                if (row.Text == "Automatic")\r
+                if (row.SubItems[1].Text == "Automatic")\r
                     tracks.Add("1");\r
                 else if (row.Text != "None")\r
                 {\r
@@ -285,23 +285,23 @@ namespace Handbrake.Functions
                 }\r
 \r
                 // Audio Codec (-E)\r
-                if (row.SubItems[1].Text != String.Empty)\r
+                if (row.SubItems[2].Text != String.Empty)\r
                     codecs.Add(getAudioEncoder(row.SubItems[2].Text));\r
 \r
                 // Audio Mixdown (-6)\r
-                if (row.SubItems[2].Text != String.Empty)\r
+                if (row.SubItems[3].Text != String.Empty)\r
                     mixdowns.Add(getMixDown(row.SubItems[3].Text));\r
 \r
                 // Sample Rate (-R)\r
-                if (row.SubItems[3].Text != String.Empty)\r
+                if (row.SubItems[4].Text != String.Empty)\r
                     samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
 \r
                 // Audio Bitrate (-B)\r
-                if (row.SubItems[4].Text != String.Empty)\r
+                if (row.SubItems[5].Text != String.Empty)\r
                     bitrates.Add(row.SubItems[5].Text.Replace("Auto", "auto"));\r
 \r
                 // DRC (-D)\r
-                if (row.SubItems[5].Text != String.Empty)\r
+                if (row.SubItems[6].Text != String.Empty)\r
                     drcs.Add(row.SubItems[6].Text);\r
             }\r
 \r