GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when item is already in a view

Browse Source 
#1679
This commit is contained in:
Wojtek Figat
2023-10-13 11:31:43 +02:00
parent d0fbf12b92
commit db52be5936
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Editor/Content/GUI/ContentView.cs
View File

@@ -220,8 +220,9 @@ namespace FlaxEditor.Content.GUI
// Remove references and unlink items // Remove references and unlink items
for (int i = 0; i < _items.Count; i++) for (int i = 0; i < _items.Count; i++)
{ {
_items[i].Parent = null; var item = _items[i];
_items[i].RemoveReference(this); item.Parent = null;
item.RemoveReference(this);
} }
_items.Clear(); _items.Clear();
@@ -263,11 +264,12 @@ namespace FlaxEditor.Content.GUI
// Add references and link items // Add references and link items
for (int i = 0; i < items.Count; i++) for (int i = 0; i < items.Count; i++)
{ {
if (items[i].Visible) var item = items[i];
if (item.Visible && !_items.Contains(item))
{ {
items[i].Parent = this; item.Parent = this;
items[i].AddReference(this); item.AddReference(this);
_items.Add(items[i]); _items.Add(item);
} }
} }
if (selection != null) if (selection != null)

2
Source/Editor/Content/Items/ContentItem.cs
View File

@@ -323,8 +323,6 @@ namespace FlaxEditor.Content
/// <param name="value">The new path.</param> /// <param name="value">The new path.</param>
internal virtual void UpdatePath(string value) internal virtual void UpdatePath(string value)
{ {
Assert.AreNotEqual(Path, value);
// Set path // Set path
Path = StringUtils.NormalizePath(value); Path = StringUtils.NormalizePath(value);
FileName = System.IO.Path.GetFileName(value); FileName = System.IO.Path.GetFileName(value);