From 87e7d32665f99c7380e8fe2c5574e1bc73ac428f Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 15 Jun 2022 09:47:26 +0100 Subject: [PATCH] Check nil --- roomserver/storage/shared/storage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index ead5762c1..461b895c1 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -438,7 +438,7 @@ func (d *Database) events( results := make([]types.Event, len(inputEventNIDs)) eventNIDs := make([]types.EventNID, 0, len(results)) for _, nid := range inputEventNIDs { - if event, ok := d.Cache.GetRoomServerEvent(nid); ok { + if event, ok := d.Cache.GetRoomServerEvent(nid); ok && event != nil { results = append(results, types.Event{ EventNID: nid, Event: event,