From dc51324e9b16248ade0b1c440385cff5f0ef4ee8 Mon Sep 17 00:00:00 2001 From: Ethan Moffat Date: Tue, 5 Apr 2022 20:42:58 -0700 Subject: [PATCH] Fix ListDialogItem click causing hyperlinks to be clicked twice --- EndlessClient/Dialogs/ListDialogItem.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/EndlessClient/Dialogs/ListDialogItem.cs b/EndlessClient/Dialogs/ListDialogItem.cs index 3ddb51833..8d2fa4471 100644 --- a/EndlessClient/Dialogs/ListDialogItem.cs +++ b/EndlessClient/Dialogs/ListDialogItem.cs @@ -223,10 +223,8 @@ protected override void OnUpdateControl(GameTime gameTime) else if(CurrentMouseState.LeftButton == ButtonState.Released && PreviousMouseState.LeftButton == ButtonState.Pressed) { - // todo: this might cause the click event to be fired twice, need to double check it - if (_subText is XNAHyperLink && _subText.MouseOver) - ((XNAHyperLink)_subText).Click(); - else + if ((_subText is IXNAHyperLink && !_subText.MouseOver) || + (_primaryText is IXNAHyperLink && !_primaryText.MouseOver)) LeftClick?.Invoke(this, EventArgs.Empty); _parentList.ChildControlClickHandled = true;