epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicate ActorIDs

Browse Source
This commit is contained in:
Chris Harris
2021-07-16 12:27:15 -05:00
committed by abcdefg30
parent 627fd4e68b
commit 1c6ca394c1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs
View File

@@ -328,7 +328,7 @@ namespace OpenRA.Mods.Common.Traits
public EditorActorPreview this[string id] public EditorActorPreview this[string id]
{ {
get { return previews.FirstOrDefault(p => p.ID.ToLowerInvariant() == id); } get { return previews.FirstOrDefault(p => p.ID.Equals(id, StringComparison.OrdinalIgnoreCase)); }
} }
} }
} }

4
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -126,11 +126,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
// Check for duplicate actor ID // Check for duplicate actor ID
if (CurrentActor.ID.Equals(actorId, StringComparison.OrdinalIgnoreCase)) if (!CurrentActor.ID.Equals(actorId, StringComparison.OrdinalIgnoreCase))
{ {
if (editorActorLayer[actorId] != null) if (editorActorLayer[actorId] != null)
{ {
nextActorIDStatus = ActorIDStatus.Duplicate; nextActorIDStatus = ActorIDStatus.Duplicate;
actorIDErrorLabel.Text = "Duplicate ActorID";
actorIDErrorLabel.Visible = true;
return; return;
} }
} }