WinGui: Fix an issue with cropping param not being send to the CLI in AutoMode. This...

Fixed an Auto-Name issue for DVD drives.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5761 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index f98fbbfc899e8f36a90003d7bdf44f66c19189f4..af0e086f96696ca36b416460bb551f6ed439b5f0 100644 (file)
--- 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);\r
             }\r
 \r
-            if (task.HasCropping)\r
-            {\r
+            //if (task.HasCropping)\r
+            //{\r
                 query += string.Format(" --crop {0}:{1}:{2}:{3}", task.Cropping.Top, task.Cropping.Bottom, task.Cropping.Left, task.Cropping.Right);\r
-            }\r
+            //}\r
 \r
             switch (task.Anamorphic)\r
             {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index b42dd72bf8bcabeed5e5c2d69cb3db117abbd4c7..fef4b1cddab0addadbe3faa34b78a6e6067ea69b 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -461,7 +461,7 @@ namespace HandBrakeWPF.ViewModels
                 }\r
 \r
                 // The title that is selected has a source name. This means it's part of a batch scan.\r
-                if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))\r
+                if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName) && !selectedTitle.SourceName.EndsWith("\\"))\r
                 {\r
                     return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);\r
                 }\r
@@ -471,7 +471,7 @@ namespace HandBrakeWPF.ViewModels
                 {\r
                     foreach (DriveInformation item in GeneralUtilities.GetDrives())\r
                     {\r
-                        if (item.RootDirectory.Contains(this.ScannedSource.ScanPath))\r
+                        if (item.RootDirectory.Contains(this.ScannedSource.ScanPath.Replace("\\\\", "\\")))\r
                         {\r
                             return item.VolumeLabel;\r
                         }\r