summaryrefslogtreecommitdiffstats
path: root/win/CS/Controls/AudioPanel.cs
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/Controls/AudioPanel.cs')
-rw-r--r--win/CS/Controls/AudioPanel.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 19fe24787..0d7c1db77 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -192,8 +192,7 @@ namespace Handbrake.Controls
this.ScannedTracks.Clear();
if (selectedTitle.AudioTracks.Count == 0)
- {
-
+ {
this.ScannedTracks.Add(AudioHelper.NoneFound);
this.drp_audioTrack.Refresh();
drp_audioTrack.SelectedIndex = 0;
@@ -960,6 +959,12 @@ namespace Handbrake.Controls
/// </returns>
private bool IsIncompatiblePassthru(AudioTrack track)
{
+ if (track.ScannedTrack == null || string.IsNullOrEmpty(track.ScannedTrack.Format))
+ {
+ return false;
+ }
+
+
// If the track isn't AC3, and the encoder is, change it.
if (track.Encoder == AudioEncoder.Ac3Passthrough && !track.ScannedTrack.Format.Contains("AC3"))
{