QSV: Merging Trunk

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5562 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 972af2910b4e93b9d38de00c910251c1faf34db2..87d0bb0c9679f53d3ba9c7bea9b755d85a5fa8a1 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -736,24 +736,6 @@ namespace HandBrakeWPF.ViewModels
                         this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;\r
                     }\r
 \r
-                    // Update the cropping values, preffering those in the presets.\r
-                    if (!preset.Task.HasCropping)\r
-                    {\r
-                        this.CropTop = title.AutoCropDimensions.Top;\r
-                        this.CropBottom = title.AutoCropDimensions.Bottom;\r
-                        this.CropLeft = title.AutoCropDimensions.Left;\r
-                        this.CropRight = title.AutoCropDimensions.Right;\r
-                        this.IsCustomCrop = false;\r
-                    }\r
-                    else\r
-                    {\r
-                        this.CropLeft = preset.Task.Cropping.Left;\r
-                        this.CropRight = preset.Task.Cropping.Right;\r
-                        this.CropTop = preset.Task.Cropping.Top;\r
-                        this.CropBottom = preset.Task.Cropping.Bottom;\r
-                        this.IsCustomCrop = true;\r
-                    }\r
-\r
                     // Set the Width, and Maintain Aspect ratio. That should calc the Height for us.\r
                     this.Width = preset.Task.Width ?? this.MaxWidth;  // Note: This will be auto-corrected in the property if it's too large.\r
 \r
@@ -769,6 +751,24 @@ namespace HandBrakeWPF.ViewModels
                     }\r
                 }\r
 \r
+                // Update the cropping values, preffering those in the presets.\r
+                if (!preset.Task.HasCropping)\r
+                {\r
+                    this.CropTop = title.AutoCropDimensions.Top;\r
+                    this.CropBottom = title.AutoCropDimensions.Bottom;\r
+                    this.CropLeft = title.AutoCropDimensions.Left;\r
+                    this.CropRight = title.AutoCropDimensions.Right;\r
+                    this.IsCustomCrop = false;\r
+                }\r
+                else\r
+                {\r
+                    this.CropLeft = preset.Task.Cropping.Left;\r
+                    this.CropRight = preset.Task.Cropping.Right;\r
+                    this.CropTop = preset.Task.Cropping.Top;\r
+                    this.CropBottom = preset.Task.Cropping.Bottom;\r
+                    this.IsCustomCrop = true;\r
+                }\r
+\r
                 // Set Screen Controls\r
                 this.SourceInfo = string.Format(\r
                     "{0}x{1}, Aspect Ratio: {2:0.00}",\r