From 19519dcb6ae69ab83c53078a3a4a69ad26989ac9 Mon Sep 17 00:00:00 2001 From: qydysky Date: Sat, 7 Oct 2023 09:16:49 +0800 Subject: [PATCH] =?utf8?q?Fix=20=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Reply/stream.go | 8 ++++++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Reply/stream.go b/Reply/stream.go index 453db77..2e58aef 100644 --- a/Reply/stream.go +++ b/Reply/stream.go @@ -1205,10 +1205,14 @@ func (t *M4SStream) Start() bool { // 设置事件 // 当录制停止时，取消全部录制 mainCtx, mainCancel := context.WithCancel(context.Background()) - mainCtx, done := pctx.WithWait(mainCtx, time.Minute) + mainCtx, done := pctx.WithWait(mainCtx, 0, time.Minute) defer func() { - if done() != nil { + switch done() { + case pctx.ErrWaitTo: t.log.L(`E: `, `结束超时`) + case pctx.ErrNothingWait: + fallthrough + default: } }() diff --git a/go.mod b/go.mod index 60ed124..d7eb131 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/gotk3/gotk3 v0.6.2 github.com/mdp/qrterminal/v3 v3.1.1 - github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646 + github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 golang.org/x/text v0.13.0 diff --git a/go.sum b/go.sum index 290028f..af7ff9f 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE= github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646 h1:Ny56vzyBPU0KRmw5NwGj0p51qqMFS1smxjJYMRu9TRs= -github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646/go.mod h1:8mG30/qHGHugQSQ6XmgGeGJHH0q9WjFPdn/xwPSXwqY= +github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd h1:rs/+rnOKhFjwcbz8y8FzsK0soHnOi8YAyViu9MOvtok= +github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd/go.mod h1:8mG30/qHGHugQSQ6XmgGeGJHH0q9WjFPdn/xwPSXwqY= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= -- 2.39.2