From 14c8fa3deb6f126e51670f4682ac927d4faf6941 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 16 Dec 2020 11:01:27 +0000 Subject: [PATCH] Don't panic if the roomInfo isn't known yet --- 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 deb6859c7..b387e02b4 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -128,7 +128,7 @@ func (d *Database) RoomInfo(ctx context.Context, roomID string) (*types.RoomInfo return &roomInfo, nil } roomInfo, err := d.RoomsTable.SelectRoomInfo(ctx, roomID) - if err == nil { + if err == nil && roomInfo != nil { d.Cache.StoreRoomServerRoomID(roomInfo.RoomNID, roomID) d.Cache.StoreRoomInfo(roomID, *roomInfo) }