From e7c7a5bbc2947468183763bb23d8661466a9c0ad Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 15 Sep 2019 02:21:42 +0200 Subject: [PATCH] fixed tooltips removing themselves from a nonexistant system if an element gets removed --- MLEM.Ui/Elements/Tooltip.cs | 5 ++++- MLEM.Ui/MLEM.Ui.csproj | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MLEM.Ui/Elements/Tooltip.cs b/MLEM.Ui/Elements/Tooltip.cs index 087df92..3b34b11 100644 --- a/MLEM.Ui/Elements/Tooltip.cs +++ b/MLEM.Ui/Elements/Tooltip.cs @@ -17,7 +17,10 @@ namespace MLEM.Ui.Elements { if (elementToHover != null) { elementToHover.OnMouseEnter += element => element.System.Add(element.GetType().Name + "Tooltip", this).CanSelectContent = false; - elementToHover.OnMouseExit += element => element.System.Remove(element.GetType().Name + "Tooltip"); + elementToHover.OnMouseExit += element => { + if (this.System != null) + this.System.Remove(element.GetType().Name + "Tooltip"); + }; } } diff --git a/MLEM.Ui/MLEM.Ui.csproj b/MLEM.Ui/MLEM.Ui.csproj index 8ee3f58..4eed3af 100644 --- a/MLEM.Ui/MLEM.Ui.csproj +++ b/MLEM.Ui/MLEM.Ui.csproj @@ -10,7 +10,7 @@ https://github.com/Ellpeck/MLEM https://github.com/Ellpeck/MLEM https://github.com/Ellpeck/MLEM/blob/master/LICENSE - 1.1.5 + 1.1.6