Fix InvalidOperationException when ExitGUIException is thrown inside PropertyScope

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -102,7 +102,8 @@ private Rect PrepareTypePropertyPosition(in Rect labelPosition, in Rect inputPos
 
         protected override void OnGuiSafe(SerializedProperty property, GUIContent label, ReferencePickerAttribute attribute)
         {
-            using (var propertyScope = new PropertyScope(property, label))
+            //NOTE: we want to close scope manually because ExitGUIException can interrupt drawing and SerializedProperties stack
+            using (var propertyScope = new PropertyScope(property, label, closeManually: true))
             {
                 UpdateContexts(attribute);
 
@@ -120,6 +121,7 @@ protected override void OnGuiSafe(SerializedProperty property, GUIContent label,
                 }
 
                 EditorGUI.indentLevel--;
+                propertyScope.Close();
             }
         }
 

Assets/Editor Toolbox/Editor/Internal/PropertyScope.cs

@@ -12,11 +12,18 @@ namespace Toolbox.Editor.Internal
     internal class PropertyScope : IDisposable
     {
         private readonly SerializedProperty property;
+        private readonly bool closeManually;
+        private bool isClosed;
 
+        public PropertyScope(SerializedProperty property, GUIContent label) : this(property, label, false)
+        { }
 
-        public PropertyScope(SerializedProperty property, GUIContent label)
+        public PropertyScope(SerializedProperty property, GUIContent label, bool closeManually)
         {
             this.property = property;
+            this.closeManually = closeManually;
+            isClosed = false;
+
             ToolboxEditorGui.BeginProperty(property, ref label, out var rect);
             HandleEvents(rect);
             TryDrawLabel(rect, label);
@@ -50,9 +57,20 @@ private void TryDrawLabel(Rect rect, GUIContent label)
         }
 
 
-        public void Dispose()
+        public void Close()
         {
             ToolboxEditorGui.CloseProperty();
+            isClosed = true;
+        }
+
+        public void Dispose()
+        {
+            if (closeManually || isClosed)
+            {
+                return;
+            }
+
+            Close();
         }