Merge pull request #2151 from slingamn/modes_forwardport

fix deadlock on channel state mutex
This commit is contained in:
Shivaram Lingamneni
2024-05-06 08:47:23 +02:00
committed by GitHub
+5 -3
View File
@@ -612,9 +612,11 @@ func (channel *Channel) Founder() string {
func (channel *Channel) HighestUserMode(client *Client) (result modes.Mode) { func (channel *Channel) HighestUserMode(client *Client) (result modes.Mode) {
channel.stateMutex.RLock() channel.stateMutex.RLock()
clientModes := channel.members[client].modes defer channel.stateMutex.RUnlock()
channel.stateMutex.RUnlock() if clientData, ok := channel.members[client]; ok {
return clientModes.HighestChannelUserMode() return clientData.modes.HighestChannelUserMode()
}
return
} }
func (channel *Channel) Settings() (result ChannelSettings) { func (channel *Channel) Settings() (result ChannelSettings) {