From 561fcc1835a5c415f88a04f3a034bfbfcda68a55 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 30 Jun 2026 16:26:32 +0900
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../EditorWindow/Vrm10ColliderGroupsWindow.cs | 41 ++++++++++++++-----
 .../Editor/EditorWindow/Vrm10SpringsWindow.cs |  2 +-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Packages/VRM10/Editor/EditorWindow/Vrm10ColliderGroupsWindow.cs b/Packages/VRM10/Editor/EditorWindow/Vrm10ColliderGroupsWindow.cs
index a0f71f905..517eb0998 100644
--- a/Packages/VRM10/Editor/EditorWindow/Vrm10ColliderGroupsWindow.cs
+++ b/Packages/VRM10/Editor/EditorWindow/Vrm10ColliderGroupsWindow.cs
@@ -8,7 +8,7 @@ namespace UniVRM10
 {
     public class Vrm10ColliderGroupsWindow : EditorWindow
     {
-        const string WINDOW_TITLE = "VRM10CollierGroups";
+        const string WINDOW_TITLE = "VRM10ColliderGroups";
         const string ListPath = "SpringBone.ColliderGroups";
         ObjectField m_target;
         SerializedObject serializedObject;
@@ -80,7 +80,14 @@ namespace UniVRM10
                 {
                     var path = $"{ListPath}.Array.data[{values[0]}]";
                     var prop = serializedObject.FindProperty(path);
-                    selected.Bind(new SerializedObject(prop.objectReferenceValue));
+                    var obj = prop.objectReferenceValue;
+
+                    selected.Unbind();
+                    selected.Clear();
+                    if (obj != null)
+                    {
+                        selected.Bind(new SerializedObject(obj));
+                    }
                     // var joint = vrm.SpringBone.Springs[values[0]].Joints.FirstOrDefault();
                     // if (joint)
                     // {
@@ -109,21 +116,33 @@ namespace UniVRM10
             HandleUtility.Repaint();
 
             if (list != null && list.selectedIndex >= 0
-                && list.selectedIndex < vrm.SpringBone.Springs.Count)
+                && list.selectedIndex < vrm.SpringBone.ColliderGroups.Count)
             {
                 Handles.color = Color.red;
-                var selected = vrm.SpringBone.ColliderGroups[list.selectedIndex];
-                foreach (var collider in selected.Colliders)
+                var group = vrm.SpringBone.ColliderGroups[list.selectedIndex];
+                if (group == null)
                 {
-                    if (collider)
+                    return;
+                }
+
+                var matrixBackup = Handles.matrix;
+                try
+                {
+                    foreach (var collider in group.Colliders)
                     {
-                        // collider.DrawGizmos();
-                        Handles.matrix = collider.transform.localToWorldMatrix;
-                        Handles.DrawWireDisc(collider.Offset, Vector3.right, collider.Radius);
-                        Handles.DrawWireDisc(collider.Offset, Vector3.up, collider.Radius);
-                        Handles.DrawWireDisc(collider.Offset, Vector3.forward, collider.Radius);
+                        if (collider)
+                        {
+                            Handles.matrix = collider.transform.localToWorldMatrix;
+                            Handles.DrawWireDisc(collider.Offset, Vector3.right, collider.Radius);
+                            Handles.DrawWireDisc(collider.Offset, Vector3.up, collider.Radius);
+                            Handles.DrawWireDisc(collider.Offset, Vector3.forward, collider.Radius);
+                        }
                     }
                 }
+                finally
+                {
+                    Handles.matrix = matrixBackup;
+                }
             }
         }
     }
diff --git a/Packages/VRM10/Editor/EditorWindow/Vrm10SpringsWindow.cs b/Packages/VRM10/Editor/EditorWindow/Vrm10SpringsWindow.cs
index de2d50116..5df7c9d8d 100644
--- a/Packages/VRM10/Editor/EditorWindow/Vrm10SpringsWindow.cs
+++ b/Packages/VRM10/Editor/EditorWindow/Vrm10SpringsWindow.cs
@@ -72,7 +72,7 @@ namespace UniVRM10
 #if UNITY_2022_3_OR_NEWER
             list.selectedIndicesChanged += (e) =>
 #else
-            m_springs.onSelectedIndicesChange += (e) =>
+            list.onSelectedIndicesChange += (e) =>
 #endif
             {
                 var values = e.ToArray();