Fix 直播信息被错误覆盖

diff --git a/Reply/Msg.go b/Reply/Msg.go
index 67cf031fa4423041d95acb4d5091af94cc271f05..a258e96139d4185b1ef25896c3599d90b3d45c34 100644 (file)
--- a/Reply/Msg.go
+++ b/Reply/Msg.go
@@ -17,6 +17,7 @@ var msglog = c.C.Log.Base(`Msg`)
 
 // Msg类型数据处理方法map
 var Msg_map = map[string]func(replyF, string){
+       `PK_BATTLE_SETTLE_NEW`:              nil,
        `LIKE_GUIDE_USER`:                   nil,              //主播@你：点点赞支持一下我吧
        `ROOM_LOCK`:                         replyF.room_lock, //房间封禁提示
        `DM_INTERACTION`:                    nil,              //他们都在说

diff --git a/Reply/stream.go b/Reply/stream.go
index de86003318ded83b14ef3256b4e7887b152d7ce8..d3f19c9f2538cdc58115dec5ea4d7e2ec855683e 100644 (file)
--- a/Reply/stream.go
+++ b/Reply/stream.go
@@ -1272,22 +1272,16 @@ func (t *M4SStream) Start() bool {
 
                                        ms.getSavepath()
 
-                                       var (
-                                               cp = ms.Current_save_path
-                                               st = ms.stream_type
-                                               cr = ms.common.Roomid
-                                       )
-
                                        l := ms.log.Base_add(`文件保存`)
                                        startf := func(_ *M4SStream) error {
                                                l.L(`T: `, `开始`)
                                                return nil
                                        }
-                                       stopf := func(_ *M4SStream) error {
+                                       stopf := func(ms *M4SStream) error {
                                                // savestate
                                                {
                                                        var pathInfo paf
-                                                       fj := file.New(cp+"0.json", 0, true)
+                                                       fj := file.New(ms.Current_save_path+"0.json", 0, true)
                                                        if fj.IsExist() {
                                                                if data, err := fj.ReadAll(1<<18, 1<<20); err != nil && !errors.Is(err, io.EOF) {
                                                                        l.L(`E: `, err)
@@ -1300,12 +1294,12 @@ func (t *M4SStream) Start() bool {
                                                        pathInfo.Uname = ms.common.Uname
                                                        pathInfo.UpUid = ms.common.UpUid
                                                        pathInfo.Roomid = ms.common.Roomid
-                                                       pathInfo.Format = st
+                                                       pathInfo.Format = ms.stream_type
                                                        pathInfo.Qn = c.C.Qn[ms.common.Live_qn]
                                                        pathInfo.Name = ms.common.Title
                                                        pathInfo.EndT = time.Now().Format(time.DateTime)
                                                        pathInfo.StartLiveT = ms.common.Live_Start_Time.Format(time.DateTime)
-                                                       pathInfo.Path = path.Base(cp)
+                                                       pathInfo.Path = path.Base(ms.Current_save_path)
                                                        if pathInfoJson, err := json.Marshal(pathInfo); err != nil {
                                                                l.L(`E: `, err)
                                                        } else if _, err := fj.Write(pathInfoJson, true); err != nil {
@@ -1322,6 +1316,12 @@ func (t *M4SStream) Start() bool {
                                                l.L(`W: `, err)
                                        }
 
+                                       var (
+                                               cp = ms.Current_save_path
+                                               st = ms.stream_type
+                                               cr = ms.common.Roomid
+                                       )
+
                                        // savestate
                                        {
                                                fj := file.New(cp+"0.json", 0, true)