SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 04:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix task cancel

Browse source
This commit is contained in:
世界 2023-04-18 17:05:05 +08:00
parent d9426b04ab
commit f33bd0f122
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/context.go
View file

@ -6,6 +6,10 @@ import (
)
func SelectContext(contextList []context.Context) (int, error) {
if len(contextList) == 1 {
<-contextList[0].Done()
return 0, contextList[0].Err()
}
chosen, _, _ := reflect.Select(Map(Filter(contextList, func(it context.Context) bool {
return it.Done() != nil
}), func(it context.Context) reflect.SelectCase {

2
common/task/task.go
View file

@ -86,7 +86,7 @@ func (g *Group) RunContextList(contextList []context.Context) error {
}()
}
selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskContext}, contextList...))
selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskCancelContext}, contextList...))
if selectedContext != 0 {
returnError = E.Append(returnError, upstreamErr, func(err error) error {
return E.Cause(err, "upstream")