PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fix rare crash in entity view sorting

Browse Source
This commit is contained in:
Brant Martin
2019-06-03 19:56:29 -04:00
parent ebef1edc09
commit 121846eeae
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Torch.Server/ViewModels/Entities/EntityViewModel.cs
View File

@@ -85,9 +85,20 @@ namespace Torch.Server.ViewModels.Entities
public virtual int CompareToSort(EntityViewModel other, EntityTreeViewModel.SortEnum sort) public virtual int CompareToSort(EntityViewModel other, EntityTreeViewModel.SortEnum sort)
{ {
if (other == null)
return -1;
switch (sort) switch (sort)
{ {
case EntityTreeViewModel.SortEnum.Name: case EntityTreeViewModel.SortEnum.Name:
if (Name == null)
{
if (other.Name == null)
return 0;
return 1;
}
if (other.Name == null)
return -1;
return string.Compare(Name, other.Name, StringComparison.InvariantCultureIgnoreCase); return string.Compare(Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
case EntityTreeViewModel.SortEnum.Size: case EntityTreeViewModel.SortEnum.Size:
return Entity.WorldVolume.Radius.CompareTo(other.Entity.WorldVolume.Radius); return Entity.WorldVolume.Radius.CompareTo(other.Entity.WorldVolume.Radius);