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

Fix rare exception in Visject after recent Surface context menu groups display refactor

Browse Source
This commit is contained in:
Wojtek Figat
2022-07-31 19:06:15 +02:00
parent 17b3434342
commit 1fdc43699c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Surface/AnimGraphSurface.cs
View File

@@ -115,7 +115,7 @@ namespace FlaxEditor.Surface
// Check if context menu doesn't have the recent cached groups // Check if context menu doesn't have the recent cached groups
if (!contextMenu.Groups.Any(g => g.Archetypes[0].Tag is int asInt && asInt == _version)) if (!contextMenu.Groups.Any(g => g.Archetypes[0].Tag is int asInt && asInt == _version))
{ {
var groups = contextMenu.Groups.Where(g => g.Archetypes[0].Tag is int).ToArray(); var groups = contextMenu.Groups.Where(g => g.Archetypes.Count != 0 && g.Archetypes[0].Tag is int).ToArray();
foreach (var g in groups) foreach (var g in groups)
contextMenu.RemoveGroup(g); contextMenu.RemoveGroup(g);
foreach (var g in _cache.Values) foreach (var g in _cache.Values)
@@ -125,7 +125,7 @@ namespace FlaxEditor.Surface
else else
{ {
// Remove any old groups from context menu // Remove any old groups from context menu
var groups = contextMenu.Groups.Where(g => g.Archetypes[0].Tag is int).ToArray(); var groups = contextMenu.Groups.Where(g => g.Archetypes.Count != 0 && g.Archetypes[0].Tag is int).ToArray();
foreach (var g in groups) foreach (var g in groups)
contextMenu.RemoveGroup(g); contextMenu.RemoveGroup(g);

6
Source/Editor/Surface/VisualScriptSurface.cs
View File

@@ -77,9 +77,9 @@ namespace FlaxEditor.Surface
if (_cache.Count != 0) if (_cache.Count != 0)
{ {
// Check if context menu doesn't have the recent cached groups // Check if context menu doesn't have the recent cached groups
if (!contextMenu.Groups.Any(g => g.Archetypes[0].Tag is int asInt && asInt == _version)) if (!contextMenu.Groups.Any(g => g.Archetypes.Count != 0 && g.Archetypes[0].Tag is int asInt && asInt == _version))
{ {
var groups = contextMenu.Groups.Where(g => g.Archetypes[0].Tag is int).ToArray(); var groups = contextMenu.Groups.Where(g => g.Archetypes.Count != 0 && g.Archetypes[0].Tag is int).ToArray();
foreach (var g in groups) foreach (var g in groups)
contextMenu.RemoveGroup(g); contextMenu.RemoveGroup(g);
foreach (var g in _cache.Values) foreach (var g in _cache.Values)
@@ -89,7 +89,7 @@ namespace FlaxEditor.Surface
else else
{ {
// Remove any old groups from context menu // Remove any old groups from context menu
var groups = contextMenu.Groups.Where(g => g.Archetypes[0].Tag is int).ToArray(); var groups = contextMenu.Groups.Where(g => g.Archetypes.Count != 0 && g.Archetypes[0].Tag is int).ToArray();
foreach (var g in groups) foreach (var g in groups)
contextMenu.RemoveGroup(g); contextMenu.RemoveGroup(g);