Skip to content

Commit abc520c

Browse files
committed
Fix nullref on missing m_Calls
1 parent dcdf006 commit abc520c

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

RuntimeUnityEditor/Windows/ObjectTree/ObjectTreeViewer.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,15 @@ private void DrawSingleComponent(Component component)
482482
for (var i = 0; i < eventObj.GetPersistentEventCount(); ++i)
483483
GUILayout.Label(ToStringConverter.EventEntryToString(eventObj, i));
484484

485-
var calls = (IList)eventObj.GetPrivateExplicit<UnityEventBase>("m_Calls").GetPrivate("m_RuntimeCalls");
486-
foreach (var call in calls)
487-
GUILayout.Label(ToStringConverter.ObjectToString(call.GetPrivate("Delegate")));
485+
try
486+
{
487+
var calls = (IList)eventObj.GetPrivateExplicit<UnityEventBase>("m_Calls").GetPrivate("m_RuntimeCalls");
488+
foreach (var call in calls)
489+
GUILayout.Label(ToStringConverter.ObjectToString(call.GetPrivate("Delegate")));
490+
}
491+
catch (NullReferenceException)
492+
{
493+
}
488494

489495
GUILayout.FlexibleSpace();
490496
if (GUILayout.Button("?"))
@@ -497,9 +503,15 @@ private void DrawSingleComponent(Component component)
497503
for (var i = 0; i < eventObj.GetPersistentEventCount(); ++i)
498504
GUILayout.Label(ToStringConverter.EventEntryToString(b.onValueChanged, i));
499505

500-
var calls = (IList)b.onValueChanged.GetPrivateExplicit<UnityEventBase>("m_Calls").GetPrivate("m_RuntimeCalls");
501-
foreach (var call in calls)
502-
GUILayout.Label(ToStringConverter.ObjectToString(call.GetPrivate("Delegate")));
506+
try
507+
{
508+
var calls = (IList)b.onValueChanged.GetPrivateExplicit<UnityEventBase>("m_Calls").GetPrivate("m_RuntimeCalls");
509+
foreach (var call in calls)
510+
GUILayout.Label(ToStringConverter.ObjectToString(call.GetPrivate("Delegate")));
511+
}
512+
catch (NullReferenceException)
513+
{
514+
}
503515

504516
GUILayout.FlexibleSpace();
505517
if (GUILayout.Button("?"))

0 commit comments

Comments
 (0)