Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-12 23:06:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix destroy logic with lists/dicts

Browse Source
This commit is contained in:
sinaioutlander
2020-11-16 22:44:47 +11:00
parent 91d5fc284f
commit 5207b1a1c4
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Inspectors/Reflection/CacheObject/CacheObjectBase.cs
View File

@ -43,7 +43,8 @@ namespace UnityExplorer.Inspectors.Reflection
public void Destroy() public void Destroy()
{ {
GameObject.Destroy(this.m_mainContent); if (this.m_mainContent)
GameObject.Destroy(this.m_mainContent);
} }
public virtual void UpdateValue() public virtual void UpdateValue()

15
src/Inspectors/Reflection/InteractiveValue/InteractiveDictionary.cs
View File

@ -65,18 +65,13 @@ namespace UnityExplorer.Inspectors.Reflection
{ {
RefIDictionary = Value as IDictionary; RefIDictionary = Value as IDictionary;
if (Value != null) if (m_subContentParent.activeSelf)
{ {
if (m_subContentParent.activeSelf) GetCacheEntries();
{ RefreshDisplay();
GetCacheEntries();
RefreshDisplay();
}
else
m_recacheWanted = true;
} }
else else
m_entries.Clear(); m_recacheWanted = true;
base.OnValueUpdated(); base.OnValueUpdated();
} }
@ -122,7 +117,7 @@ namespace UnityExplorer.Inspectors.Reflection
} }
#if CPP #if CPP
if (RefIDictionary == null && !Value.IsNullOrDestroyed()) if (RefIDictionary == null && Value != null)
RefIDictionary = EnumerateWithReflection(); RefIDictionary = EnumerateWithReflection();
#endif #endif

15
src/Inspectors/Reflection/InteractiveValue/InteractiveEnumerable.cs
View File

@ -49,18 +49,13 @@ namespace UnityExplorer.Inspectors.Reflection
RefIEnumerable = Value as IEnumerable; RefIEnumerable = Value as IEnumerable;
RefIList = Value as IList; RefIList = Value as IList;
if (Value != null) if (m_subContentParent.activeSelf)
{ {
if (m_subContentParent.activeSelf) GetCacheEntries();
{ RefreshDisplay();
GetCacheEntries();
RefreshDisplay();
}
else
m_recacheWanted = true;
} }
else else
m_entries.Clear(); m_recacheWanted = true;
base.OnValueUpdated(); base.OnValueUpdated();
} }
@ -108,7 +103,7 @@ namespace UnityExplorer.Inspectors.Reflection
} }
#if CPP #if CPP
if (RefIEnumerable == null && !Value.IsNullOrDestroyed()) if (RefIEnumerable == null && Value != null)
RefIEnumerable = EnumerateWithReflection(); RefIEnumerable = EnumerateWithReflection();
#endif #endif