summaryrefslogtreecommitdiff
path: root/indra/llui/llemojihelper.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2022-10-23 17:47:51 +0200
committerKitty Barnett <develop@catznip.com>2022-10-23 16:29:12 +0200
commit58cdcd5dd23778c6fad9fa0da31b670ceff8eeeb (patch)
tree006bac63739acc32b6d11b61c30931fe3796632d /indra/llui/llemojihelper.cpp
parent8d08f417dc1f5b2681774f000951993e0f0cf79f (diff)
Handle return and escape in the mini emoji helper
Diffstat (limited to 'indra/llui/llemojihelper.cpp')
-rw-r--r--indra/llui/llemojihelper.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index d4c31ee986..54c801ab7b 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -98,6 +98,11 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)
{
+ if (ctrl_p && !isActive(ctrl_p))
+ {
+ return;
+ }
+
setHostCtrl(nullptr);
}