FIX: Closing profiler marker properly (#1631)

Unity-Technologies · Feb 9, 2023 · e8f41a6 · e8f41a6
1 parent 8d6d568
commit e8f41a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
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)
                 {