summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrake.ApplicationServices
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/HandBrake.ApplicationServices
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/HandBrake.ApplicationServices')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs
index e4312e451..519d0480a 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeEncoderHelpers.cs
@@ -458,6 +458,11 @@ namespace HandBrake.ApplicationServices.Interop
/// </returns>
public static HBMixdown SanitizeMixdown(HBMixdown mixdown, HBAudioEncoder encoder, ulong layout)
{
+ if (mixdown == null)
+ {
+ return null;
+ }
+
int sanitizedMixdown = HBFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
if (sanitizedMixdown != -1)
{