From 13206fcfb86844ba4a0c872eaf8c11a61ea848df Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 28 Nov 2020 03:37:01 +0100
Subject: Fix media modal crashing when media has no blurhash (#15229)
---
app/javascript/mastodon/features/ui/components/media_modal.js | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'app/javascript')
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index bcec19a49..58cef1e9d 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -221,9 +221,12 @@ class MediaModal extends ImmutablePureComponent {
_sendBackgroundColor () {
const { media, onChangeBackgroundColor } = this.props;
const index = this.getIndex();
- const backgroundColor = decodeRGB(decode83(media.getIn([index, 'blurhash']).slice(2, 6)));
+ const blurhash = media.getIn([index, 'blurhash']);
- onChangeBackgroundColor(backgroundColor);
+ if (blurhash) {
+ const backgroundColor = decodeRGB(decode83(blurhash.slice(2, 6)));
+ onChangeBackgroundColor(backgroundColor);
+ }
}
componentWillUnmount () {
--
cgit