Add additional null checks to ApplyConfiguration

ronaldbarendse · ronaldbarendse · commit bb45b62b814b · 2021-06-23T22:44:16.000+02:00
diff --git a/src/Umbraco.Core/PropertyEditors/ImageCropperConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ImageCropperConfiguration.cs
@@ -42,7 +42,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,
             {
                 foreach (var configuredCrop in configuredCrops)
                 {
-                    var crop = imageCropperValue.Crops.FirstOrDefault(x => x.Alias == configuredCrop.Alias);
+                    var crop = imageCropperValue.Crops?.FirstOrDefault(x => x.Alias == configuredCrop.Alias);
 
                     crops.Add(new ImageCropperCrop
                     {
diff --git a/src/Umbraco.Web/PropertyEditors/MediaPicker3Configuration.cs b/src/Umbraco.Web/PropertyEditors/MediaPicker3Configuration.cs
@@ -77,7 +77,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,
             {
                 foreach (var configuredCrop in configuredCrops)
                 {
-                    var crop = imageCropperValue.Crops.FirstOrDefault(x => x.Alias == configuredCrop.Alias);
+                    var crop = imageCropperValue.Crops?.FirstOrDefault(x => x.Alias == configuredCrop.Alias);
 
                     crops.Add(new ImageCropperCrop
                     {
@@ -91,7 +91,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,
 
             imageCropperValue.Crops = crops;
 
-            if (!configuration.EnableLocalFocalPoint)
+            if (configuration?.EnableLocalFocalPoint == false)
             {
                 imageCropperValue.FocalPoint = null;
             }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,`
`42`	`42`	`{`
`43`	`43`	`foreach (var configuredCrop in configuredCrops)`
`44`	`44`	`{`
`45`		`- var crop = imageCropperValue.Crops.FirstOrDefault(x => x.Alias == configuredCrop.Alias);`
	`45`	`+ var crop = imageCropperValue.Crops?.FirstOrDefault(x => x.Alias == configuredCrop.Alias);`
`46`	`46`
`47`	`47`	`crops.Add(new ImageCropperCrop`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,`
`77`	`77`	`{`
`78`	`78`	`foreach (var configuredCrop in configuredCrops)`
`79`	`79`	`{`
`80`		`- var crop = imageCropperValue.Crops.FirstOrDefault(x => x.Alias == configuredCrop.Alias);`
	`80`	`+ var crop = imageCropperValue.Crops?.FirstOrDefault(x => x.Alias == configuredCrop.Alias);`
`81`	`81`
`82`	`82`	`crops.Add(new ImageCropperCrop`
`83`	`83`	`{`
`@@ -91,7 +91,7 @@ public static void ApplyConfiguration(this ImageCropperValue imageCropperValue,`
`91`	`91`
`92`	`92`	`imageCropperValue.Crops = crops;`
`93`	`93`
`94`		`- if (!configuration.EnableLocalFocalPoint)`
	`94`	`+ if (configuration?.EnableLocalFocalPoint == false)`
`95`	`95`	`{`
`96`	`96`	`imageCropperValue.FocalPoint = null;`
`97`	`97`	`}`