about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMitarashiDango <MitarashiDango@users.noreply.github.com>2017-10-04 23:28:39 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-04 16:28:39 +0200
commitecfa1c3f3bbe02fa619ac000da51eccd3acbdc8a (patch)
tree5bb81f0b30e6c8dd406f52b19cc24d7b2bbc8db0 /app
parentb3af3f9f8cd5ed9c7ee06452e981b1b7734e1d89 (diff)
fix error (When part of conversation has already been deleted.) (#5216)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/actions/timelines.js2
1 files changed, 1 insertions, 1 deletions
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')]);
       }