secondlife/viewer#1249 Erratic Emoji Picker Behavior

2 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index 51b31a72ca..78b94d1b0c 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -333,6 +333,14 @@ void LLFloaterEmojiPicker::onOpen(const LLSD& key)
     gFloaterView->adjustToFitScreen(this, FALSE);
 }
 
+void LLFloaterEmojiPicker::onClose(bool app_quitting)
+{
+    if (!app_quitting)
+    {
+        LLEmojiHelper::instance().hideHelper(nullptr, true);
+    }
+}
+
 void LLFloaterEmojiPicker::dirtyRect()
 {
     super::dirtyRect();
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 5d0402ca83..e9e01ee5d3 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -94,6 +94,7 @@ private:
     void unselectGridIcon(LLEmojiGridIcon* icon);
 
     void onOpen(const LLSD& key) override;
+    void onClose(bool app_quitting) override;
     virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override;
 
     class LLPanel* mGroups { nullptr };