diff options
| author | sr55 <[email protected]> | 2015-02-01 12:40:05 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-02-01 12:40:05 +0000 |
| commit | c8d9395c370d727a9a73a31c70cde5459258c3e8 (patch) | |
| tree | ed003d3bc72d7a79c0bcca14f6b1ad7d472a615c /win/CS/HandBrakeWPF | |
| parent | 0fc6cf45fab0cc1caa21a2a7e31a4d2e9aa2ee67 (diff) | |
WinGui: Fix a crash in the tooltip converter.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6857 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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;
}
/// <summary>
|