Skip to content

fix: do not access/render runtime info if not playing in the editor #898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFA11 merged 1 commit into from
Jun 10, 2021
Merged

fix: do not access/render runtime info if not playing in the editor #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/NetworkBehaviourEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,12 @@ public override void OnInspectorGUI()
EditorGUI.BeginChangeCheck();
serializedObject.Update();

for (int i = 0; i < m_NetworkVariableNames.Count; i++)
if (EditorApplication.isPlaying)
{
RenderNetworkVariable(i);
for (int i = 0; i < m_NetworkVariableNames.Count; i++)
{
RenderNetworkVariable(i);
}
}

var property = serializedObject.GetIterator();
Expand Down
4 changes: 2 additions & 2 deletions com.unity.multiplayer.mlapi/Editor/NetworkObjectEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public override void OnInspectorGUI()
{
Initialize();

if (!m_NetworkObject.IsSpawned && m_NetworkObject.NetworkManager != null && m_NetworkObject.NetworkManager.IsServer)
if (EditorApplication.isPlaying && !m_NetworkObject.IsSpawned && m_NetworkObject.NetworkManager != null && m_NetworkObject.NetworkManager.IsServer)
Copy link
Contributor

@jeffreyrainy jeffreyrainy Jun 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be safer to do:
if (EditorApplication.isPlaying && m_NetworkObject != null && !m_NetworkObject.IsSpawned && m_NetworkObject.NetworkManager != null && m_NetworkObject.NetworkManager.IsServer)
e.g. checking that the m_NetworkObject is set ?

Copy link
Contributor Author

@0xFA11 0xFA11 Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m_NetworkObject is coming from UnityEditor.Editor::target (maybe see Initialize())

{
EditorGUILayout.BeginHorizontal();
EditorGUILayout.LabelField(new GUIContent("Spawn", "Spawns the object across the network"));
Expand All @@ -39,7 +39,7 @@ public override void OnInspectorGUI()

EditorGUILayout.EndHorizontal();
}
else if (m_NetworkObject.IsSpawned)
else if (EditorApplication.isPlaying && m_NetworkObject.IsSpawned)
Copy link
Contributor

@jeffreyrainy jeffreyrainy Jun 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same: && m_NetworkObject != null in the middle ?

Copy link
Contributor Author

@0xFA11 0xFA11 Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^ see above

{
var guiEnabled = GUI.enabled;
GUI.enabled = false;
Expand Down