From ecfa1c3f3bbe02fa619ac000da51eccd3acbdc8a Mon Sep 17 00:00:00 2001 From: MitarashiDango Date: Wed, 4 Oct 2017 23:28:39 +0900 Subject: [PATCH] fix error (When part of conversation has already been deleted.) (#5216) --- app/javascript/mastodon/actions/timelines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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')]); }