From 8953a1a76e1758655b37ec1e03f7313f9746f2d8 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Sun, 20 Apr 2014 21:19:55 +0200
Subject: [PATCH] Handle users request with sessions.

---
 src/app/spreed-speakfreely-server/roomworker.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/spreed-speakfreely-server/roomworker.go b/src/app/spreed-speakfreely-server/roomworker.go
index bf76232f..568546ea 100644
--- a/src/app/spreed-speakfreely-server/roomworker.go
+++ b/src/app/spreed-speakfreely-server/roomworker.go
@@ -134,7 +134,7 @@ func (r *RoomWorker) Run(f func()) bool {
 func (r *RoomWorker) usersHandler(c *Connection) {
 
 	worker := func() {
-		users := &DataSessions{Type: "Users"}
+		sessions := &DataSessions{Type: "Users"}
 		var sl []*DataSession
 		appender := func(ec *Connection) bool {
 			ecsession := ec.Session
@@ -164,17 +164,17 @@ func (r *RoomWorker) usersHandler(c *Connection) {
 				break
 			}
 		}
-		users.Users = sl
-		usersJson := c.h.buffers.New()
-		encoder := json.NewEncoder(usersJson)
-		err := encoder.Encode(&DataOutgoing{From: c.Id, Data: users})
+		sessions.Users = sl
+		sessionsJson := c.h.buffers.New()
+		encoder := json.NewEncoder(sessionsJson)
+		err := encoder.Encode(&DataOutgoing{From: c.Id, Data: sessions})
 		if err != nil {
 			log.Println("Users error while encoding JSON", err)
-			usersJson.Decref()
+			sessionsJson.Decref()
 			return
 		}
-		c.send(usersJson)
-		usersJson.Decref()
+		c.send(sessionsJson)
+		sessionsJson.Decref()
 
 	}