From: sr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Wed, 17 Jun 2009 17:36:50 +0000 (+0000)
Subject: WinGui:
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c9981fd2abfed4873c149936f37e65bc550cd78;p=handbrake-jp%2Fhandbrake-jp-git.git

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 f6ea60e5..6428097b 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -248,18 +248,6 @@ namespace Handbrake.Functions
                     newTrack.SubItems.Add(track.DRC);
                     mainWindow.audioPanel.addTrackForPreset(newTrack);
                 }
-
-            /*/ Subtitle Stuff
-            mainWindow.drp_subtitle.Text = presetQuery.Subtitles;
-
-            if (presetQuery.ForcedSubtitles)
-            {
-                mainWindow.check_forced.CheckState = CheckState.Checked;
-                mainWindow.check_forced.Enabled = true;
-            }
-            else
-                mainWindow.check_forced.CheckState = CheckState.Unchecked;*/
-
             #endregion
 
             #region Other
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 341338d2..b8184243 100644
--- 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)
             {
                 // Audio Track (-a)
-                if (row.Text == "Automatic")
+                if (row.SubItems[1].Text == "Automatic")
                     tracks.Add("1");
                 else if (row.Text != "None")
                 {
@@ -285,23 +285,23 @@ namespace Handbrake.Functions
                 }
 
                 // Audio Codec (-E)
-                if (row.SubItems[1].Text != String.Empty)
+                if (row.SubItems[2].Text != String.Empty)
                     codecs.Add(getAudioEncoder(row.SubItems[2].Text));
 
                 // Audio Mixdown (-6)
-                if (row.SubItems[2].Text != String.Empty)
+                if (row.SubItems[3].Text != String.Empty)
                     mixdowns.Add(getMixDown(row.SubItems[3].Text));
 
                 // Sample Rate (-R)
-                if (row.SubItems[3].Text != String.Empty)
+                if (row.SubItems[4].Text != String.Empty)
                     samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));
 
                 // Audio Bitrate (-B)
-                if (row.SubItems[4].Text != String.Empty)
+                if (row.SubItems[5].Text != String.Empty)
                     bitrates.Add(row.SubItems[5].Text.Replace("Auto", "auto"));
 
                 // DRC (-D)
-                if (row.SubItems[5].Text != String.Empty)
+                if (row.SubItems[6].Text != String.Empty)
                     drcs.Add(row.SubItems[6].Text);
             }