Skip to content

Commit e4f2475

Browse files
FIX: Only dispatch when there is a valid selected item when removing all action maps (#2383)
1 parent b48ccf5 commit e4f2475

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99

1010
### Fixed
1111

12+
- Fixed a `NullReferenceException` thrown when removing all action maps [UUM-137116](https://jira.unity3d.com/browse/UUM-137116)
1213
- Simplified default setting messaging by consolidating repetitive messages into a single HelpBox.
1314
- Fixed a `NullPointerReferenceException` thrown in `InputManagerStateMonitors.FireStateChangeNotifications` logging by adding validation [UUM-136095].
1415
- Fixed auto-save not working for Input System actions in Project Settings when both the Project Settings and Input System Actions windows were open [UUM-134035](https://jira.unity3d.com/browse/UUM-134035)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
2121
m_ListViewSelectionChangeFilter = new CollectionViewSelectionChangeFilter(m_ListView);
2222
m_ListViewSelectionChangeFilter.selectedIndicesChanged += (selectedIndices) =>
2323
{
24-
Dispatch(Commands.SelectActionMap(((ActionMapData)m_ListView.selectedItem).mapName));
24+
if (m_ListView.selectedItem is ActionMapData mapData)
25+
Dispatch(Commands.SelectActionMap(mapData.mapName));
2526
};
2627

2728
m_ListView.bindItem = (element, i) =>

0 commit comments

Comments
 (0)