FIX: ObjectDisposedException regression when deleting actions maps (ISXB-831) (#1901)

* Original bug fix retrieved propertyPath from cached SerializedProperty, but in this scenario underlying Property has been disposed

* Updated the fix to instead cache propertyPath during initialization when SerializedProperty is valid

Author: timkeo

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests.
 ### Fixed
 - Physical keyboards used on Android/ChromeOS could have keys "stuck" reporting as pressed after a long press and release [ISXB-475](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-475).
 - NullReferenceException thrown when right-clicking an empty Action Map list in Input Actions Editor windows [ISXB-833](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-833).
+- Fixed an issue where `System.ObjectDisposedException` would be thrown when deleting the last ActionMap item in the Input Actions Asset editor.
 
 ## [1.8.1] - 2024-03-14
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputAction.cs

@@ -18,6 +18,7 @@ public SerializedInputAction(SerializedProperty serializedProperty)
             type = (InputActionType)serializedProperty.FindPropertyRelative(nameof(InputAction.m_Type)).intValue;
             interactions = serializedProperty.FindPropertyRelative(nameof(InputAction.m_Interactions)).stringValue;
             processors = serializedProperty.FindPropertyRelative(nameof(InputAction.m_Processors)).stringValue;
+            propertyPath = wrappedProperty.propertyPath;
             initialStateCheck = ReadInitialStateCheck(serializedProperty);
             actionTypeTooltip = serializedProperty.FindPropertyRelative(nameof(InputAction.m_Type)).GetTooltip();
             expectedControlTypeTooltip = serializedProperty.FindPropertyRelative(nameof(InputAction.m_ExpectedControlType)).GetTooltip();
@@ -29,6 +30,7 @@ public SerializedInputAction(SerializedProperty serializedProperty)
         public InputActionType type { get; }
         public string interactions { get; }
         public string processors { get; }
+        public string propertyPath { get; }
         public bool initialStateCheck { get; }
         public string actionTypeTooltip { get; }
         public string expectedControlTypeTooltip { get; }
@@ -60,7 +62,7 @@ public bool Equals(SerializedInputAction other)
                 && initialStateCheck == other.initialStateCheck
                 && actionTypeTooltip == other.actionTypeTooltip
                 && expectedControlTypeTooltip == other.expectedControlTypeTooltip
-                && wrappedProperty.propertyPath == other.wrappedProperty.propertyPath;
+                && propertyPath == other.propertyPath;
         }
 
         public override bool Equals(object obj)
@@ -79,7 +81,7 @@ public override int GetHashCode()
             hashCode.Add(initialStateCheck);
             hashCode.Add(actionTypeTooltip);
             hashCode.Add(expectedControlTypeTooltip);
-            hashCode.Add(wrappedProperty.propertyPath);
+            hashCode.Add(propertyPath);
             return hashCode.ToHashCode();
         }
     }

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/SerializedInputBinding.cs

@@ -24,6 +24,7 @@ public SerializedInputBinding(SerializedProperty serializedProperty)
             interactions = serializedProperty.FindPropertyRelative("m_Interactions").stringValue;
             processors = serializedProperty.FindPropertyRelative("m_Processors").stringValue;
             action = serializedProperty.FindPropertyRelative("m_Action").stringValue;
+            propertyPath = wrappedProperty.propertyPath;
             var bindingGroups = serializedProperty.FindPropertyRelative(nameof(InputBinding.m_Groups)).stringValue;
             controlSchemes = bindingGroups != null
                 ? bindingGroups.Split(InputBinding.kSeparatorString, StringSplitOptions.RemoveEmptyEntries)
@@ -44,6 +45,7 @@ public SerializedInputBinding(SerializedProperty serializedProperty)
         public string interactions { get; }
         public string processors { get; }
         public string action { get; }
+        public string propertyPath { get; }
         public string[] controlSchemes { get; }
         public InputBinding.Flags flags { get; }
 
@@ -88,7 +90,7 @@ public bool Equals(SerializedInputBinding other)
                 && isPartOfComposite == other.isPartOfComposite
                 && compositePath == other.compositePath
                 && controlSchemes.SequenceEqual(other.controlSchemes)
-                && wrappedProperty.propertyPath == other.wrappedProperty.propertyPath;
+                && propertyPath == other.propertyPath;
         }
 
         public override bool Equals(object obj)
@@ -110,7 +112,7 @@ public override int GetHashCode()
             hashCode.Add(isPartOfComposite);
             hashCode.Add(compositePath);
             hashCode.Add(controlSchemes);
-            hashCode.Add(wrappedProperty.propertyPath);
+            hashCode.Add(propertyPath);
             return hashCode.ToHashCode();
         }
     }