From 5be1eda4eef5f07632b552e1930fdd90b62dbcd7 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 30 Jun 2015 23:34:13 +0200 Subject: [PATCH] Don't return users twice in "Welcome" from global room. --- src/app/spreed-webrtc-server/roomworker.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/spreed-webrtc-server/roomworker.go b/src/app/spreed-webrtc-server/roomworker.go index 95355309..9302638d 100644 --- a/src/app/spreed-webrtc-server/roomworker.go +++ b/src/app/spreed-webrtc-server/roomworker.go @@ -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 + } } }