diff options
author | sr55 <[email protected]> | 2019-01-01 15:24:46 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2019-01-01 15:24:46 +0000 |
commit | e95a1e43f7bb111a9431ba5b97f3fcd1610a07fa (patch) | |
tree | 3b403b4e17879d1a2bade2c2394f1cb3fb9a03c7 /win | |
parent | 3efe700b9a8a0fc815c709b8154960b600bc8f7b (diff) |
WinGui: Fix restriction on the picture settings tab after setting a preset. It will use whatever is smaller. Source, or Preset #1773
Diffstat (limited to 'win')
-rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs index 1764a7dac..914d54068 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs @@ -653,8 +653,12 @@ namespace HandBrakeWPF.ViewModels }
else
{
- this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
- this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+
+ int presetWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
+ int presetHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+
+ this.MaxWidth = presetWidth <= this.sourceResolution.Width ? presetWidth : this.sourceResolution.Width;
+ this.MaxHeight = presetHeight <= this.sourceResolution.Height ? presetHeight : this.sourceResolution.Height;
}
// Set the width, then check the height doesn't breach the max height and correct if necessary.
|