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

2017-10-04 23:28:39 +09:00 · 2017-10-04 23:28:39 +09:00 · ecfa1c3f3b
parent b3af3f9f8c
commit ecfa1c3f3b
1 changed files with 1 additions and 1 deletions
--- 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')]);
      }