summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-09-16 18:56:16 +0000
committersr55 <[email protected]>2011-09-16 18:56:16 +0000
commitccbaa9137a2275647a22b86487109f694c0f732d (patch)
treeb2571e6d72497940ba5cdd09ee7300815eb6629b
parentee032aae30e70df2e9586abda9516cf2bb457990 (diff)
WinGui: Correctly reload audio tracks on queue edit.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4227 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/Controls/AudioPanel.cs7
-rw-r--r--win/CS/frmMain.cs3
2 files changed, 8 insertions, 2 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 84ff1e509..1b9b331c6 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -182,7 +182,12 @@ namespace Handbrake.Controls
this.audioTracks.Add(track);
}
- this.AutomaticTrackSelection();
+ if (tracks.Count == 0 || tracks[0].ScannedTrack.TrackNumber == 0)
+ {
+ this.AutomaticTrackSelection();
+ }
+
+
if (this.AudioListChanged != null)
this.AudioListChanged(this, new EventArgs());
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 63623343d..6687dd540 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -2209,8 +2209,9 @@ namespace Handbrake
// Now load the preset
PresetLoader.LoadPreset(this, preset);
+ this.AudioSettings.LoadTracks(queueEdit.Task.AudioTracks);
- // Set the destination path
+ // Set the destination path);
this.text_destination.Text = queueEdit.Destination;
// The x264 widgets will need updated, so do this now: