summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
authorsr55 <[email protected]>2017-04-11 16:27:24 +0100
committersr55 <[email protected]>2017-04-11 16:27:24 +0100
commitf09dc2daecdd2567eb860a6491d0f7b6c9cb289a (patch)
treede5b81a6415f7aa82652fa0ce8edb8f0a6c5da17 /win/CS
parent2aa7640a1fcb8485fd929b189b34e07e6f81cfcc (diff)
WinGui: Handle auto-passthru correctly in the mixdown sanatising code.
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 472eccb7f..8d7047a5b 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -125,7 +125,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
this.mixDown = track.MixDown != null ? track.MixDown.ShortName : "dpl2";
// If the mixdown isn't supported, downgrade it.
- if (encoderInfo != null && !HandBrakeEncoderHelpers.MixdownIsSupported(track.MixDown, encoderInfo, sourceTrack.ChannelLayout))
+ if (track.MixDown != null && encoderInfo != null && !HandBrakeEncoderHelpers.MixdownIsSupported(track.MixDown, encoderInfo, sourceTrack.ChannelLayout))
{
HBMixdown changedMixdown = HandBrakeEncoderHelpers.GetDefaultMixdown(encoderInfo, (ulong)sourceTrack.ChannelLayout);
if (changedMixdown != null)