Fix potential blueprint nullrefs with the new structure

This commit is contained in:
smoogipoo
2019-10-17 16:14:28 +09:00
parent bc41eb176e
commit 510ce9345f
2 changed files with 32 additions and 18 deletions

View File

@ -123,12 +123,20 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (blueprint == null)
return;
blueprint.Selected += onBlueprintSelected;
blueprint.Deselected += onBlueprintDeselected;
blueprint.SelectionRequested += onSelectionRequested;
blueprint.DragRequested += onDragRequested;
if (hitObject.IsLoaded)
addBlueprint();
else
hitObject.OnLoadComplete += _ => addBlueprint();
selectionBlueprints.Add(blueprint);
void addBlueprint()
{
blueprint.Selected += onBlueprintSelected;
blueprint.Deselected += onBlueprintDeselected;
blueprint.SelectionRequested += onSelectionRequested;
blueprint.DragRequested += onDragRequested;
selectionBlueprints.Add(blueprint);
}
}
private void removeBlueprintFor(DrawableHitObject hitObject) => removeBlueprintFor(hitObject.HitObject);