about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-08-08 17:57:56 +0200
committerGitHub <noreply@github.com>2020-08-08 17:57:56 +0200
commitbd3420b1398c4c4ab2e2f2850b6dd6eaff0d361b (patch)
treea3995737843bd631c9880867efdfccf19170b568 /app/javascript
parent4a4d08f3a078fbc6380a786145cc05f67c1f6e90 (diff)
Fix crash when failing to load emoji picker (#14525)
Fixes #14523
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js2
1 files changed, 1 insertions, 1 deletions
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 });
       });
     }