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

Fix potential deadlock in room switching

Browse Source
This commit is contained in:
Tulir Asokan 2019-04-27 15:11:38 +03:00
parent b6b50e8e1d
commit 08d99d776d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/room-list.go
View File

@ -438,11 +438,11 @@ func (list *RoomList) clickRoom(line, column int, mod bool) bool {
return false
}
list.RLock()
defer list.RUnlock()
for _, tag := range list.tags {
trl := list.items[tag]
if line--; line == -1 {
trl.ToggleCollapse()
list.RUnlock()
return true
}
@ -453,7 +453,9 @@ func (list *RoomList) clickRoom(line, column int, mod bool) bool {
if line < 0 {
break
} else if line < trl.Length() {
list.parent.SwitchRoom(tag, trl.Visible()[trl.Length()-1-line].Room)
switchToRoom := trl.Visible()[trl.Length()-1-line].Room
list.RUnlock()
list.parent.SwitchRoom(tag, switchToRoom)
return true
}
@ -482,6 +484,7 @@ func (list *RoomList) clickRoom(line, column int, mod bool) bool {
// Tag footer
line--
}
list.RUnlock()
return false
}