Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add another nil check in room list

Browse Source
This commit is contained in:
Tulir Asokan 2020-03-03 14:01:27 +02:00
parent c829e436e4
commit 43212996e9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/tag-room-list.go
View File

@ -189,7 +189,7 @@ func (trl *TagRoomList) Insert(order json.Number, mxRoom *rooms.Room) {
} }
} }
trl.rooms = append(trl.rooms, nil) trl.rooms = append(trl.rooms, nil)
copy(trl.rooms[insertAt+1:], trl.rooms[insertAt:]) copy(trl.rooms[insertAt+1:], trl.rooms[insertAt:len(trl.rooms)-1])
trl.rooms[insertAt] = room trl.rooms[insertAt] = room
} }
@ -210,6 +210,10 @@ func (trl *TagRoomList) Bump(mxRoom *rooms.Room) {
roomBeingBumped = currentIndexRoom roomBeingBumped = currentIndexRoom
} }
} }
if roomBeingBumped == nil {
debug.Print("Warning: couldn't find room", mxRoom.ID, mxRoom.NameCache, "to bump in tag", trl.name)
return
}
// If the room being bumped should be first in the list, it won't be inserted during the loop. // If the room being bumped should be first in the list, it won't be inserted during the loop.
trl.rooms[len(trl.rooms)-1] = roomBeingBumped trl.rooms[len(trl.rooms)-1] = roomBeingBumped
} }