From: qydysky <32743305+qydysky@users.noreply.github.com>
Date: Fri, 20 Jan 2023 18:57:53 +0000 (+0800)
Subject: Fix ws重新链接避免重复录制
X-Git-Tag: v0.5.11~31
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=d7bfd16bafcd2e0bad15599d325c3c0e364bff96;p=bili_danmu%2F.git

Fix ws重新链接避免重复录制
---

diff --git a/Reply/F.go b/Reply/F.go
index c8aedee..9a44409 100644
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -118,12 +118,13 @@ func selfcross2(a []string) (float32, string) {
 }
 
 // 功能区
-// ShowRev 显示h营收
+// ShowRev 显示营收
 var (
 	ShowRev_old   float64
 	ShowRev_start bool
 )
 
+// 显示营收
 func ShowRevf() {
 	if !IsOn("统计营收") {
 		return
@@ -310,9 +311,7 @@ func init() {
 					tmp.Callback_stop = func(ms *M4SStream) {
 						streamO.Delete(ms.common.Roomid) //流服务去除
 					}
-					if tmp.Start() {
-						streamO.Store(item.Roomid, tmp)
-					}
+					tmp.Start()
 				} else if !item.IsRec && ok {
 					if v.(*M4SStream).Status.Islive() {
 						v.(*M4SStream).Stop()
@@ -330,13 +329,16 @@ func init() {
 }
 
 // 获取实例的录制状态
-func StreamOStatus(roomid int) bool {
+func StreamOStatus(roomid int) (Islive bool) {
 	v, ok := streamO.Load(roomid)
 	return ok && (v.(*M4SStream).Status.Islive() || v.(*M4SStream).exitSign.Islive())
 }
 
 // 开始实例
 func StreamOStart(roomid int) {
+	if StreamOStatus(roomid) {
+		return
+	}
 	var (
 		tmp    = new(M4SStream)
 		common = c.C
@@ -359,9 +361,7 @@ func StreamOStart(roomid int) {
 	tmp.Callback_stop = func(ms *M4SStream) {
 		streamO.Delete(ms.common.Roomid) //流服务去除
 	}
-	if tmp.Start() {
-		streamO.Store(roomid, tmp)
-	}
+	tmp.Start()
 }
 
 // 停止实例