From: ThibG <thib@sitedethib.com>
Date: Sat, 8 Aug 2020 15:57:56 +0000 (+0200)
Subject: Fix crash when failing to load emoji picker (#14525)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bd3420b1398c4c4ab2e2f2850b6dd6eaff0d361b;p=mastodon.git

Fix crash when failing to load emoji picker (#14525)

Fixes #14523
---

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 360a7af6a..e8a36a923 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -315,7 +315,7 @@ class EmojiPickerDropdown extends React.PureComponent {
 
         this.setState({ loading: false });
       }).catch(() => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, active: false });
       });
     }