From: MitarashiDango <MitarashiDango@users.noreply.github.com>
Date: Wed, 4 Oct 2017 14:28:39 +0000 (+0900)
Subject: fix error (When part of conversation  has already been deleted.) (#5216)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ecfa1c3f3bbe02fa619ac000da51eccd3acbdc8a;p=mastodon.git

fix error (When part of conversation  has already been deleted.) (#5216)
---

diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index cdaafd89c..09abe2702 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -37,7 +37,7 @@ export function updateTimeline(timeline, status) {
     if (status.in_reply_to_id) {
       let parent = getState().getIn(['statuses', status.in_reply_to_id]);
 
-      while (parent.get('in_reply_to_id')) {
+      while (parent && parent.get('in_reply_to_id')) {
         parents.push(parent.get('id'));
         parent = getState().getIn(['statuses', parent.get('in_reply_to_id')]);
       }