Browse Source

Try Catch around VarListLayout so we can eat the error that occurs when moving from play back to edit

master
desktop-maesty/steve 7 years ago
parent
commit
17cd4cde4e
  1. 10
      Assets/Fungus/Scripts/Editor/FlowchartWindow.cs
  2. 12
      Assets/Fungus/Scripts/Editor/VariableListAdaptor.cs

10
Assets/Fungus/Scripts/Editor/FlowchartWindow.cs

@ -514,11 +514,15 @@ namespace Fungus.EditorUtils
if (variableListAdaptor != null)
{
if (variableListAdaptor.TargetFlowchart == null)
variableListAdaptor = null;
else
if (variableListAdaptor.TargetFlowchart != null)
{
variableListAdaptor.DrawVarList(0);
}
else
{
variableListAdaptor = null;
}
}
if(EditorGUI.EndChangeCheck())
{

12
Assets/Fungus/Scripts/Editor/VariableListAdaptor.cs

@ -138,10 +138,16 @@ namespace Fungus.EditorUtils
public void DrawVarList(int w)
{
//we want to eat the throw that occurs when switching back to editor from play
try
{
if (_arrayProperty == null || _arrayProperty.serializedObject == null)
return;
_arrayProperty.serializedObject.Update();
this.widthOfList = (w == 0 ? VariableListAdaptor.DefaultWidth : w) - ScrollSpacer;
if(GUILayout.Button("Variables"))
if (GUILayout.Button("Variables"))
{
_arrayProperty.isExpanded = !_arrayProperty.isExpanded;
}
@ -152,6 +158,10 @@ namespace Fungus.EditorUtils
}
_arrayProperty.serializedObject.ApplyModifiedProperties();
}
catch (Exception)
{
}
}
public void DrawItem(Rect position, int index, bool selected, bool focused)
{

Loading…
Cancel
Save