summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2014-04-26 17:41:13 +0000
committersr55 <[email protected]>2014-04-26 17:41:13 +0000
commit605148d6f7b83974688adb9461bf221eb7af512a (patch)
treee01fe0815f4defc4df9c044bdf94f61d4414feb4
parent65a280e54b37280fd8a9068a79b2e859115b7131 (diff)
WinGui: Custom W/H check should be for custom only.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6171 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs2
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index ac48134d4..de6ad54eb 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -184,7 +184,7 @@ namespace HandBrakeWPF.ViewModels
return;
}
- if (this.CustomWidth == null && this.CustomHeight == null)
+ if (this.CustomWidth == null && this.CustomHeight == null && this.SelectedPictureSettingMode == PresetPictureSettingsMode.Custom)
{
this.errorService.ShowMessageBox("The Custom Width or Height fields must be filled in for the 'Custom' option.", Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
return;
diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index b8f2a265b..c1bc619a5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -20,7 +20,6 @@ namespace HandBrakeWPF.ViewModels
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
using HandBrake.ApplicationServices.Parsing;
- using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrakeWPF.Services.Interfaces;
using HandBrakeWPF.ViewModels.Interfaces;