Bugfix: Don't wait on the unregister channel to avoid dipose() race c…

…ondition
knadh · Nov 19, 2016 · 10c6b17 · 10c6b17
1 parent 27666fb
commit 10c6b17
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/conn.go b/conn.go
@@ -272,7 +272,10 @@ func (room *Room) setExpiry(seconds int) {
 func (peer *Peer) listen() {
 	defer func() {
 		if _, exists := rooms[peer.room_id]; exists {
-			rooms[peer.room_id].unregister <- peer
+			select {
+			case rooms[peer.room_id].unregister <- peer:
+			default:
+			}
 		}
 		peer.ws.Close()
 	}()