Skip to content

Commit

Permalink
Merge pull request #214 from fancycode/welcome_global_no_duplicates
Browse files Browse the repository at this point in the history
Don't return users twice in "Welcome" from global room.
  • Loading branch information
longsleep committed Jul 3, 2015
2 parents ff81505 + 5be1eda commit d85daa8
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/app/spreed-webrtc-server/roomworker.go
Expand Up @@ -207,10 +207,12 @@ func (r *roomWorker) GetUsers() []*DataSession {
}
}
r.mutex.RUnlock()
// Include connections to global room.
for _, ec := range r.manager.GlobalUsers() {
if !appender(ec) {
break
if r.id != r.manager.globalRoomID {
// Include connections to global room.
for _, ec := range r.manager.GlobalUsers() {
if !appender(ec) {
break
}
}
}

Expand Down

0 comments on commit d85daa8

Please sign in to comment.