summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2010-10-30 14:01:45 +0000
committersr55 <[email protected]>2010-10-30 14:01:45 +0000
commiteb0f5af88fc547eb58079da36df6d5fbd1072f1c (patch)
tree8b1268c7a84eb55bfe490bf375295dc4857daf55
parent1c0951a0d7d23dd2f85efa83f87ed3a59ec78737 (diff)
WinGui:
- Fix a bug in the audio panel where changing selected audio track would incorrectly set the audio bit-rate control dropdown git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3629 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/C#/Controls/AudioPanel.Designer.cs1
-rw-r--r--win/C#/Controls/AudioPanel.cs7
2 files changed, 7 insertions, 1 deletions
diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index 3349ab488..43e5ba8ec 100644
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -346,6 +346,7 @@ namespace Handbrake.Controls
//
this.audioList.AllowUserToAddRows = false;
this.audioList.AllowUserToResizeColumns = false;
+ this.audioList.AllowUserToResizeRows = false;
this.audioList.BackgroundColor = System.Drawing.Color.White;
this.audioList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
this.audioList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index 888c91c9f..e5f37d675 100644
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -638,8 +638,13 @@ namespace Handbrake.Controls
drp_audioBitrate.Items.Add("768");
}
- if (drp_audioBitrate.SelectedItem == null)
+ if (drp_audioBitrate.SelectedItem == null && audioList.SelectedRows.Count == 0)
drp_audioBitrate.SelectedIndex = drp_audioBitrate.Items.Count - 1;
+
+ if (drp_audioBitrate.SelectedItem == null && audioList.SelectedRows.Count != 0 && (string)this.audioList.SelectedRows[0].Cells[5].Value == "Auto")
+ {
+ drp_audioBitrate.SelectedItem = "160";
+ }
}
/// <summary>