Skip to content

FIX: "ArgumentNullException: Value cannot be null." when deleting a newly created input action (ISXB-1405) #2129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 7, 2025
Merged

FIX: "ArgumentNullException: Value cannot be null." when deleting a newly created input action (ISXB-1405) #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630e7af
Introduce guards for null serialized property
jfreire-unity Feb 7, 2025
9ceb506
Update CHANGELOG
jfreire-unity Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ however, it has to be formatted properly to pass verification tests.

## [Unreleased] - yyyy-mm-dd

### Fixed
- Fixed an issue where removing a newly created action in the Asset Editor would cause an exception. [UUM-95693](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-95693)

## [1.13.0] - 2025-02-05

### Fixed
Expand Down
17 changes: 12 additions & 5 deletions Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ public static Command DeleteAction(int actionMapIndex, string actionName)
return (in InputActionsEditorState state) =>
{
var actionMap = Selectors.GetActionMapAtIndex(state, actionMapIndex)?.wrappedProperty;
var action = Selectors.GetActionInMap(state, actionMapIndex, actionName).wrappedProperty;
var action = Selectors.GetActionInMap(state, actionMapIndex, actionName)?.wrappedProperty;
var actionIndex = action.GetIndexOfArrayElement();
var actionID = InputActionSerializationHelpers.GetId(action);
var isCut = state.IsActionCut(actionMapIndex, actionIndex);
Expand Down Expand Up @@ -638,10 +638,17 @@ public static Command ChangeActionName(int actionMapIndex, string oldName, strin
return (in InputActionsEditorState state) =>
{
var actionMap = Selectors.GetActionMapAtIndex(state, actionMapIndex)?.wrappedProperty;
var action = Selectors.GetActionInMap(state, actionMapIndex, oldName).wrappedProperty;
InputActionSerializationHelpers.RenameAction(action, actionMap, newName);
state.serializedObject.ApplyModifiedProperties();
state.m_Analytics?.RegisterActionEdit();
var action = Selectors.GetActionInMap(state, actionMapIndex, oldName)?.wrappedProperty;
// In an Asset Editor workflow, the serialized property might not exist in case a new action is created
// that is yet to be named, and it's deleted before it's named.
// This is a particular case when ActionTreeView::DeleteItem triggers
// Focus callback -> OnEditTextFinished -> ChangeActionName.
if (action != null)
{
InputActionSerializationHelpers.RenameAction(action, actionMap, newName);
state.serializedObject.ApplyModifiedProperties();
state.m_Analytics?.RegisterActionEdit();
}
return state;
};
}
Expand Down
11 changes: 8 additions & 3 deletions Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/Selectors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,17 @@ public static SerializedProperty GetActionForIndex(SerializedProperty actionMap,
return actionMap.FindPropertyRelative(nameof(InputActionMap.m_Actions)).GetArrayElementAtIndex(actionIndex);
}

public static SerializedInputAction GetActionInMap(InputActionsEditorState state, int mapIndex, string name)
public static SerializedInputAction? GetActionInMap(InputActionsEditorState state, int mapIndex, string name)
{
return new SerializedInputAction(state.serializedObject
SerializedProperty property = state.serializedObject
?.FindProperty(nameof(InputActionAsset.m_ActionMaps))?.GetArrayElementAtIndex(mapIndex)
?.FindPropertyRelative(nameof(InputActionMap.m_Actions))
?.FirstOrDefault(p => p.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue == name));
?.FirstOrDefault(p => p.FindPropertyRelative(nameof(InputAction.m_Name)).stringValue == name);

// If the action is not found, return null.
if (property == null)
return null;
return new SerializedInputAction(property);
}

public static SerializedInputBinding GetCompositeOrBindingInMap(SerializedProperty actionMap, int bindingIndex)
Expand Down