resolve conflict

dotnet · Feb 12, 2025 · 75d4c18 · 75d4c18
2 parents 84f1c7a + d787bc9
commit 75d4c18
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...sign/src/System/Windows/Forms/Design/ToolStripCollectionEditor.ToolStripItemEditorForm.cs b/...sign/src/System/Windows/Forms/Design/ToolStripCollectionEditor.ToolStripItemEditorForm.cs
@@ -590,11 +590,12 @@ private void OnNewItemTypes_SelectionChangeCommitted(object sender, EventArgs e)
                 {
                     if (ex.IsCriticalException())
                     {
-                        throw;
-                    }
+                    throw;
+                }
                 }
 
                 PropertyDescriptor imageProperty = TypeDescriptor.GetProperties(newItem)[nameof(Image)];
+
                 if (imageProperty is not null && image is not null)
                 {
                     imageProperty.SetValue(newItem, image);