From b136955edb1dfcb5f861165a64523c2acf906f85 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Mon, 19 May 2025 00:11:32 +0800
Subject: [PATCH] Fix data race (#209)

* Fix data race

* Fix data race
---
 Reply/F.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Reply/F.go b/Reply/F.go
index c188b5d..4cbd56c 100644
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -154,24 +154,22 @@ func StreamOStart(roomid int) {
 	}
 
 	common, _ := c.CommonsLoadOrInit.LoadOrInitPThen(roomid)(func(actual *c.Common, loaded bool) (*c.Common, bool) {
-		actual.Roomid = roomid
 		return actual, loaded
 	})
 
 	if tmp, e := NewM4SStream(common); e != nil {
 		flog.L(`E: `, e)
 	} else {
-		tmp.common.Roomid = roomid
 		//实例回调，避免重复录制
 		tmp.Callback_start = func(ms *M4SStream) error {
 			//流服务添加
-			if _, ok := c.StreamO.LoadOrStore(ms.common.Roomid, tmp); ok {
-				return fmt.Errorf("已存在此直播间(%d)录制", ms.common.Roomid)
+			if _, ok := c.StreamO.LoadOrStore(roomid, tmp); ok {
+				return fmt.Errorf("已存在此直播间(%d)录制", roomid)
 			}
 			return nil
 		}
 		tmp.Callback_stop = func(ms *M4SStream) {
-			c.StreamO.Delete(ms.common.Roomid) //流服务去除
+			c.StreamO.Delete(roomid) //流服务去除
 		}
 		tmp.Start()
 	}
-- 
2.39.2