Browse Source

Merge pull request #214 from fancycode/welcome_global_no_duplicates

Don't return users twice in "Welcome" from global room.
pull/208/head
Simon Eisenmann 10 years ago
parent
commit
d85daa87bd
  1. 2
      src/app/spreed-webrtc-server/roomworker.go

2
src/app/spreed-webrtc-server/roomworker.go

@ -207,12 +207,14 @@ func (r *roomWorker) GetUsers() []*DataSession { @@ -207,12 +207,14 @@ func (r *roomWorker) GetUsers() []*DataSession {
}
}
r.mutex.RUnlock()
if r.id != r.manager.globalRoomID {
// Include connections to global room.
for _, ec := range r.manager.GlobalUsers() {
if !appender(ec) {
break
}
}
}
out <- sl
}

Loading…
Cancel
Save