summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Services/Encode/Model
diff options
context:
space:
mode:
authorsr55 <[email protected]>2016-04-17 15:17:51 +0100
committersr55 <[email protected]>2016-04-17 15:17:51 +0100
commit0023b69f26cb79492c5c32e5ba227a5d91da418c (patch)
treecff4eb13fa33ca8af6aff6cde4c408edbe894a66 /win/CS/HandBrakeWPF/Services/Encode/Model
parentdc0c8ac59176e94f7d2c0338ca286c5a4b73c6ea (diff)
WinGui: Change the Audio Default and Subtitle panels to be modal windows. (Similar to the MacGUI). This should allow for more space needed to implement Audio templates. Also fixed a sanitise mixdown call crash.
Diffstat (limited to 'win/CS/HandBrakeWPF/Services/Encode/Model')
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 43138481a..53b162f87 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -645,12 +645,11 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
HBMixdown sanitisedMixdown = HandBrakeEncoderHelpers.SanitizeMixdown(currentMixdown, aencoder, (uint)this.ScannedTrack.ChannelLayout);
HBMixdown defaultMixdown = HandBrakeEncoderHelpers.GetDefaultMixdown(aencoder, (uint)this.ScannedTrack.ChannelLayout);
-
if (this.mixDown == null || this.mixDown == "none")
{
this.MixDown = defaultMixdown.ShortName;
}
- else
+ else if (sanitisedMixdown != null)
{
this.MixDown = sanitisedMixdown.ShortName;
}