Merge pull request #1021 from MartinBuehlmann/bugfixActionMessage

vb2ae · web-flow · commit 92a47a7fc146 · 2025-10-22T20:43:15.000-04:00
Fix NullReferenceException in ActionMessage when EnableGuardDuringInvocation is enabled
diff --git a/src/Caliburn.Micro.Platform/ActionMessage.cs b/src/Caliburn.Micro.Platform/ActionMessage.cs
@@ -416,7 +416,7 @@ protected override void Invoke(object eventArgs)
 
             _context.EventArgs = eventArgs;
 
-            if (EnforceGuardsDuringInvocation && (_context?.CanExecute() != true))
+            if (EnforceGuardsDuringInvocation && _context.CanExecute != null && !_context.CanExecute())
             {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ protected override void Invoke(object eventArgs)`
`416`	`416`
`417`	`417`	`_context.EventArgs = eventArgs;`
`418`	`418`
`419`		`- if (EnforceGuardsDuringInvocation && (_context?.CanExecute() != true))`
	`419`	`+ if (EnforceGuardsDuringInvocation && _context.CanExecute != null && !_context.CanExecute())`
`420`	`420`	`{`
`421`	`421`	`return;`
`422`	`422`	`}`