Skip to content

Commit 9443a1c

Browse files
FIX: Fix breaking changes from ISBX-110 (#1652)
1 parent 7767170 commit 9443a1c

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionMap.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -1463,18 +1463,23 @@ internal struct BindingOverrideJson
14631463
public string interactions;
14641464
public string processors;
14651465

1466-
public static BindingOverrideJson FromBinding(InputBinding binding, InputAction bindingAction = null)
1466+
public static BindingOverrideJson FromBinding(InputBinding binding, string actionName)
14671467
{
14681468
return new BindingOverrideJson
14691469
{
1470-
action = bindingAction != null && !bindingAction.isSingletonAction ? $"{bindingAction.actionMap.name}/{bindingAction.name}" : "",
1470+
action = actionName,
14711471
id = binding.id.ToString() ,
14721472
path = binding.overridePath ?? "null",
14731473
interactions = binding.overrideInteractions ?? "null",
14741474
processors = binding.overrideProcessors ?? "null"
14751475
};
14761476
}
14771477

1478+
public static BindingOverrideJson FromBinding(InputBinding binding)
1479+
{
1480+
return FromBinding(binding, binding.action);
1481+
}
1482+
14781483
public static InputBinding ToBinding(BindingOverrideJson bindingOverride)
14791484
{
14801485
return new InputBinding

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionRebindingExtensions.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,8 @@ private static void AddBindingOverrideJsonTo(this IInputActionCollection2 action
11431143
if (action == null)
11441144
action = actions.FindAction(binding.action);
11451145

1146-
var @override = InputActionMap.BindingOverrideJson.FromBinding(binding, action);
1146+
string actionName = action != null && !action.isSingletonAction ? $"{action.actionMap.name}/{action.name}" : "";
1147+
var @override = InputActionMap.BindingOverrideJson.FromBinding(binding, actionName);
11471148

11481149
list.Add(@override);
11491150
}

0 commit comments

Comments
 (0)