CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Make LastChannel logic work.

Browse source
This commit is contained in:
Mikkel Krautz 2011-11-12 21:36:32 +01:00
parent 41689595f2
commit b1d6717a04
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server.go
View file

@ -561,10 +561,18 @@ func (server *Server) finishAuthenticate(client *Client) {
server.hclients[host] = append(server.hclients[host], client)
server.hmutex.Unlock()
channel := server.RootChannel()
if client.IsRegistered() {
lastChannel := server.Channels[client.user.LastChannelId]
if lastChannel != nil {
channel = lastChannel
}
}
userstate := &mumbleproto.UserState{
Session: proto.Uint32(client.Session),
Name: proto.String(client.ShownName()),
ChannelId: proto.Uint32(0),
ChannelId: proto.Uint32(uint32(channel.Id)),
}
if len(client.CertHash) > 0 {
@ -601,7 +609,7 @@ func (server *Server) finishAuthenticate(client *Client) {
}
}
server.userEnterChannel(client, server.RootChannel(), userstate)
server.userEnterChannel(client, channel, userstate)
if err := server.broadcastProtoMessage(userstate); err != nil {
// Server panic?
}