diff options
| author | sr55 <[email protected]> | 2011-07-02 15:08:05 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-07-02 15:08:05 +0000 |
| commit | 3598b91f625b11fc1556407987a2c4120e7a0e17 (patch) | |
| tree | 784e7804d44d987d9fae4dfde0cbcf556e97c029 | |
| parent | 627b77a266f554b8f001b8d6d1a52f2ab971ff34 (diff) | |
WinGui: Fix an issue that allowed Mp4 only options to be selected with MKV. (Large file etc)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4082 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/CS/frmMain.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs index 62ec2471f..261077aa2 100644 --- a/win/CS/frmMain.cs +++ b/win/CS/frmMain.cs @@ -1725,20 +1725,24 @@ namespace Handbrake AudioSettings.SetContainer(drop_format.Text);
- if (drop_format.Text.Contains("MP4"))
+ if (drop_format.Text.Contains("MP4") && drp_videoEncoder.Items.Contains("VP3 (Theora)"))
{
- if (drp_videoEncoder.Items.Contains("VP3 (Theora)"))
+ drp_videoEncoder.Items.Remove("VP3 (Theora)");
+ if (drp_videoEncoder.SelectedItem == null)
{
- drp_videoEncoder.Items.Remove("VP3 (Theora)");
- drp_videoEncoder.SelectedIndex = 1;
+ drp_videoEncoder.SelectedIndex = 0;
}
}
- else if (drop_format.Text.Contains("MKV"))
+ else if (drop_format.Text.Contains("MKV") && !drp_videoEncoder.Items.Contains("VP3 (Theora)"))
+ {
drp_videoEncoder.Items.Add("VP3 (Theora)");
+ }
}
public void SetExtension(string newExtension)
{
+ setContainerOpts();
+
if (newExtension == ".mp4" || newExtension == ".m4v")
if (Check_ChapterMarkers.Checked || AudioSettings.RequiresM4V() || Subtitles.RequiresM4V() || Properties.Settings.Default.useM4v == 2)
newExtension = Properties.Settings.Default.useM4v == 1 ? ".mp4" : ".m4v";
@@ -1752,8 +1756,6 @@ namespace Handbrake // Video Tab
private void drp_videoEncoder_SelectedIndexChanged(object sender, EventArgs e)
{
- setContainerOpts();
-
// Turn off some options which are H.264 only when the user selects a non h.264 encoder
if (drp_videoEncoder.Text.Contains("H.264"))
{
|