Skip to content

Commit 261cbd6

Browse files
committed
Fix test failure checking an empty json, omitt versioning.
1 parent 40ce21e commit 261cbd6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,10 @@ static class JsonVersion
314314
/// <seealso cref="FromJson"/>
315315
public string ToJson()
316316
{
317+
var hasContent = (m_ActionMaps?.Length ?? 0) > 0 || (m_ControlSchemes?.Length ?? 0) > 0;
317318
return JsonUtility.ToJson(new WriteFileJson
318319
{
319-
version = JsonVersion.Current,
320+
version = hasContent ? JsonVersion.Current : null,
320321
name = name,
321322
maps = InputActionMap.WriteFileJson.FromMaps(m_ActionMaps).maps,
322323
controlSchemes = InputControlScheme.SchemeJson.ToJson(m_ControlSchemes),
@@ -974,7 +975,7 @@ private void OnDestroy()
974975
[Serializable]
975976
internal struct WriteFileJson
976977
{
977-
public int version;
978+
public int? version;
978979
public string name;
979980
public InputActionMap.WriteMapJson[] maps;
980981
public InputControlScheme.SchemeJson[] controlSchemes;

0 commit comments

Comments
 (0)