about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-08 13:28:55 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-08 13:28:55 +0200
commitb1938d7853f1d52f9bd99244c550cc609dd81202 (patch)
tree670210f97e2c97951a3a77ce46427f4a4dcf2377 /app/javascript
parent993e68a7dd40a3fcb8312ee13f873da278e9e3fa (diff)
Do not crash in getStatusIds when there is a gap in the timeline (fixes #7400) (#7415)
Fixes a crash occurring when the “gap” disconnection indicator is to be
displayed in a filtered timeline.
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/ui/containers/status_list_container.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 4efacda65..e5b1edc4a 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -21,6 +21,8 @@ const makeGetStatusIds = () => createSelector([
   }
 
   return statusIds.filter(id => {
+    if (id === null) return true;
+
     const statusForId = statuses.get(id);
     let showStatus    = true;