From 1901457e8b1d66abc1e321d887968e1419cb489e Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 1 Sep 2013 15:01:23 +0000 Subject: WinGui: Fix an issue with cropping param not being send to the CLI in AutoMode. This is an issue where scan previewer count >10. Fixed an Auto-Name issue for DVD drives. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5761 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Utilities/QueryGeneratorUtility.cs | 6 +++--- win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'win/CS') diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index f98fbbfc8..af0e086f9 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -266,10 +266,10 @@ namespace HandBrake.ApplicationServices.Utilities if (task.Height.HasValue && task.Height != 0) query += string.Format(" -l {0}", task.Height); } - if (task.HasCropping) - { + //if (task.HasCropping) + //{ query += string.Format(" --crop {0}:{1}:{2}:{3}", task.Cropping.Top, task.Cropping.Bottom, task.Cropping.Left, task.Cropping.Right); - } + //} switch (task.Anamorphic) { diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index b42dd72bf..fef4b1cdd 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -461,7 +461,7 @@ namespace HandBrakeWPF.ViewModels } // The title that is selected has a source name. This means it's part of a batch scan. - if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName)) + if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName) && !selectedTitle.SourceName.EndsWith("\\")) { return Path.GetFileNameWithoutExtension(selectedTitle.SourceName); } @@ -471,7 +471,7 @@ namespace HandBrakeWPF.ViewModels { foreach (DriveInformation item in GeneralUtilities.GetDrives()) { - if (item.RootDirectory.Contains(this.ScannedSource.ScanPath)) + if (item.RootDirectory.Contains(this.ScannedSource.ScanPath.Replace("\\\\", "\\"))) { return item.VolumeLabel; } -- cgit v1.2.3