From f09dc2daecdd2567eb860a6491d0f7b6c9cb289a Mon Sep 17 00:00:00 2001 From: sr55 Date: Tue, 11 Apr 2017 16:27:24 +0100 Subject: WinGui: Handle auto-passthru correctly in the mixdown sanatising code. --- win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win/CS/HandBrakeWPF') 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) -- cgit v1.2.3