Avoid launching fallback dialog on cancellation

glopesdev · glopesdev · commit 020bd4aa5a77 · 2023-07-15T23:12:43.000+01:00
diff --git a/Bonsai.Design/AnnotationTextEditor.cs b/Bonsai.Design/AnnotationTextEditor.cs
@@ -30,10 +30,9 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
                 {
                     using var editorDialog = new AnnotationBuilderEditorDialog();
                     editorDialog.Annotation = (string)value;
-                    if (editorService.ShowDialog(editorDialog) == DialogResult.OK)
-                    {
-                        return editorDialog.Annotation;
-                    }
+                    return editorService.ShowDialog(editorDialog) == DialogResult.OK
+                        ? editorDialog.Annotation
+                        : value;
                 }
             }
 
diff --git a/Bonsai.Scripting.Expressions.Design/ExpressionScriptEditor.cs b/Bonsai.Scripting.Expressions.Design/ExpressionScriptEditor.cs
@@ -31,10 +31,9 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
                 {
                     using var editorDialog = new ExpressionScriptEditorDialog();
                     editorDialog.Script = (string)value;
-                    if (editorService.ShowDialog(editorDialog) == DialogResult.OK)
-                    {
-                        return editorDialog.Script;
-                    }
+                    return editorService.ShowDialog(editorDialog) == DialogResult.OK
+                        ? editorDialog.Script
+                        : value;
                 }
             }
 
diff --git a/Bonsai.Scripting.IronPython.Design/PythonScriptEditor.cs b/Bonsai.Scripting.IronPython.Design/PythonScriptEditor.cs
@@ -31,10 +31,9 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
                 {
                     using var editorDialog = new PythonScriptEditorDialog();
                     editorDialog.Script = (string)value;
-                    if (editorService.ShowDialog(editorDialog) == DialogResult.OK)
-                    {
-                        return editorDialog.Script;
-                    }
+                    return editorService.ShowDialog(editorDialog) == DialogResult.OK
+                        ? editorDialog.Script
+                        : value;
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,9 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide`
`30`	`30`	`{`
`31`	`31`	`using var editorDialog = new AnnotationBuilderEditorDialog();`
`32`	`32`	`editorDialog.Annotation = (string)value;`
`33`		`- if (editorService.ShowDialog(editorDialog) == DialogResult.OK)`
`34`		`- {`
`35`		`- return editorDialog.Annotation;`
`36`		`- }`
	`33`	`+ return editorService.ShowDialog(editorDialog) == DialogResult.OK`
	`34`	`+ ? editorDialog.Annotation`
	`35`	`+ : value;`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,9 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide`
`31`	`31`	`{`
`32`	`32`	`using var editorDialog = new ExpressionScriptEditorDialog();`
`33`	`33`	`editorDialog.Script = (string)value;`
`34`		`- if (editorService.ShowDialog(editorDialog) == DialogResult.OK)`
`35`		`- {`
`36`		`- return editorDialog.Script;`
`37`		`- }`
	`34`	`+ return editorService.ShowDialog(editorDialog) == DialogResult.OK`
	`35`	`+ ? editorDialog.Script`
	`36`	`+ : value;`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`