From: ThibG <thib@sitedethib.com>
Date: Sat, 16 Feb 2019 13:53:27 +0000 (+0100)
Subject: Fix crash on public hashtag pages when streaming fails (#10061)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=041ff5fa9a45f7b8d1048a05a35611622b6f5fdb;p=mastodon.git

Fix crash on public hashtag pages when streaming fails (#10061)
---

diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 734353c9b..49bc43a7b 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -87,7 +87,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
   }
 
   render () {
-    const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+    const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
     const { compact } = this.props;