From: sr55 <sr55.hb@outlook.com>
Date: Tue, 11 Apr 2017 14:01:55 +0000 (+0100)
Subject: WinGui: Fix a potential crash in the audio track mixdown handling code.
X-Git-Tag: 1.1.0~599
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2aa7640a1fcb8485fd929b189b34e07e6f81cfcc;p=handbrake

WinGui: Fix a potential crash in the audio track mixdown handling code.
---

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 5d0333311..472eccb7f 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 (!HandBrakeEncoderHelpers.MixdownIsSupported(track.MixDown, encoderInfo, sourceTrack.ChannelLayout))
+            if (encoderInfo != null && !HandBrakeEncoderHelpers.MixdownIsSupported(track.MixDown, encoderInfo, sourceTrack.ChannelLayout))
             {
                 HBMixdown changedMixdown = HandBrakeEncoderHelpers.GetDefaultMixdown(encoderInfo, (ulong)sourceTrack.ChannelLayout);
                 if (changedMixdown != null)