From f3fccdacea2d28078f3e09dba29361868f7cbd30 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Mon, 10 Jun 2024 19:01:09 +0100
Subject: [PATCH] Switch the check, neater fix, thanks Zi.

---
 indra/llui/llemojihelper.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index 677ee2979c..2d0db0280e 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -104,19 +104,14 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
     {
         LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
         // <FS:Beq> Try to prevent failed build of emoji picker from killing the viewer.
-        if(pHelperFloater)
-        {
-        // </FS:Beq>
-        mHelperHandle = pHelperFloater->getHandle();
-        mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
-        // <FS:Beq> Try to prevent failed build of emoji picker from killing the viewer.
-        }
-        else
+        if(!pHelperFloater)
         {
             LL_WARNS() << "Cannot show emoji helper, reason unknown." << LL_ENDL;
             return;
         }
         // </FS:Beq>
+        mHelperHandle = pHelperFloater->getHandle();
+        mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
     }
     setHostCtrl(hostctrl_p);
     mEmojiCommitCb = cb;