summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-08-08 17:57:56 +0200
committerEugen Rochko <eugen@zeonfederated.com>2020-10-19 15:40:22 +0200
commit6db143e424b7566519153e6a0c831cd77ceff227 (patch)
tree1979fd1ba721154fbbd8829d203d6926332fdc0f
parent3b699f17320de7fc1d1adc40e8edbd8ee58c9d57 (diff)
Fix crash when failing to load emoji picker (#14525)
Fixes #14523
-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 360a7af6ab9..e8a36a92314 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 });
});
}