Moved boolean condition to make sure its set even if exception is thrown

ekcoh · ekcoh · commit 4b229a29e461 · 2025-11-18T20:07:40.000+01:00
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs
@@ -2059,6 +2059,7 @@ internal void RegisterCustomTypes()
         {
             if (hasCustomTypesBeenRegistered)
                 return;
+            hasCustomTypesBeenRegistered = true;
 
             k_InputRegisterCustomTypesMarker.Begin();
 
@@ -2089,8 +2090,6 @@ internal void RegisterCustomTypes()
             }
 
             k_InputRegisterCustomTypesMarker.End();
-
-            hasCustomTypesBeenRegistered = true;
         }
 
         internal void InstallRuntime(IInputRuntime runtime)

Original file line number	Diff line number	Diff line change
`@@ -2059,6 +2059,7 @@ internal void RegisterCustomTypes()`
`2059`	`2059`	`{`
`2060`	`2060`	`if (hasCustomTypesBeenRegistered)`
`2061`	`2061`	`return;`
	`2062`	`+ hasCustomTypesBeenRegistered = true;`
`2062`	`2063`
`2063`	`2064`	`k_InputRegisterCustomTypesMarker.Begin();`
`2064`	`2065`
`@@ -2089,8 +2090,6 @@ internal void RegisterCustomTypes()`
`2089`	`2090`	`}`
`2090`	`2091`
`2091`	`2092`	`k_InputRegisterCustomTypesMarker.End();`
`2092`		`-`
`2093`		`- hasCustomTypesBeenRegistered = true;`
`2094`	`2093`	`}`
`2095`	`2094`
`2096`	`2095`	`internal void InstallRuntime(IInputRuntime runtime)`