FIX: Closing profiler marker properly (#1631)

Dmytro Ivanov · web-flow · commit e8f41a679b14 · 2023-02-09T14:00:29.000+01:00
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -10,6 +10,10 @@ however, it has to be formatted properly to pass verification tests.
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed unclosed profiler marker in `InvokeCallbacksSafe_AnyCallbackReturnsTrue` which would lead to eventually broken profiler traces in some cases like using `PlayerInput` (case ISXB-393).
+
 ## [1.5.0] - 2023-01-24
 
 ### Added
diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/DelegateHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/DelegateHelpers.cs
@@ -95,7 +95,11 @@ public static bool InvokeCallbacksSafe_AnyCallbackReturnsTrue<TValue1, TValue2>(
                 try
                 {
                     if (callbacks[i](argument1, argument2))
+                    {
+                        callbacks.UnlockForChanges();
+                        Profiler.EndSample();
                         return true;
+                    }
                 }
                 catch (Exception exception)
                 {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,11 @@ public static bool InvokeCallbacksSafe_AnyCallbackReturnsTrue<TValue1, TValue2>(`
`95`	`95`	`try`
`96`	`96`	`{`
`97`	`97`	`if (callbacks[i](argument1, argument2))`
	`98`	`+ {`
	`99`	`+ callbacks.UnlockForChanges();`
	`100`	`+ Profiler.EndSample();`
`98`	`101`	`return true;`
	`102`	`+ }`
`99`	`103`	`}`
`100`	`104`	`catch (Exception exception)`
`101`	`105`	`{`