From c8d9395c370d727a9a73a31c70cde5459258c3e8 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 1 Feb 2015 12:40:05 +0000 Subject: WinGui: Fix a crash in the tooltip converter. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6857 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'win/CS/HandBrakeWPF') diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs index a94134fc1..8c60cb998 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs @@ -44,7 +44,7 @@ namespace HandBrakeWPF.Converters.Video public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { EncodeTask task = value as EncodeTask; - if (task != null && task.VideoEncoder == VideoEncoder.X264) + if (task != null && (task.VideoEncoder == VideoEncoder.X264 || task.VideoEncoder == VideoEncoder.X265)) { if (task.ShowAdvancedTab) { @@ -62,7 +62,7 @@ namespace HandBrakeWPF.Converters.Video Environment.NewLine); } - return task != null ? task.AdvancedEncoderOptions.Trim() : string.Empty; + return task != null ? task.AdvancedEncoderOptions : string.Empty; } /// -- cgit v1.2.3